From ca0a54493d2449c664fcad42f70a97322fbe26ec Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq.com>
Date: Wed, 8 Jul 2026 17:19:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E4=BD=8D=E5=88=97=E8=A1=A8=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=81=9C=E8=BD=A6=E5=9C=BA=E5=8F=8A=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=81=9C=E8=BD=A6=E5=9C=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/ParkingManagementListController.php    |  1 -
 .../Controllers/Admin/ParkingSpaceController.php | 16 ++++++++++++++++
 app/Services/ParkingSpaceService.php             |  2 ++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Admin/ParkingManagementListController.php b/app/Http/Controllers/Admin/ParkingManagementListController.php
index a2afe44..c153429 100644
--- a/app/Http/Controllers/Admin/ParkingManagementListController.php
+++ b/app/Http/Controllers/Admin/ParkingManagementListController.php
@@ -153,7 +153,6 @@ class ParkingManagementListController
             $_this = $this;
             $items = $query->latest()->forPage($page, $perPage)->get()->each(
                 function ($item) use ($_this) {
-                    $item['parking_name'] = Parking::queryName($item['floor_id']);
                     return $_this->service->optionItems($item);
                 }
             );
diff --git a/app/Http/Controllers/Admin/ParkingSpaceController.php b/app/Http/Controllers/Admin/ParkingSpaceController.php
index 3dedb12..edc4ee2 100644
--- a/app/Http/Controllers/Admin/ParkingSpaceController.php
+++ b/app/Http/Controllers/Admin/ParkingSpaceController.php
@@ -110,6 +110,21 @@ class ParkingSpaceController extends BaseController
                 }
             }
 
+            if ($request->has('parking_id')) {
+                $parking_id = $request->input('parking_id');
+                if (!empty($parking_id)) {
+                    $floorIds = AdminFloor::query()->where(
+                        'building_floor',
+                        $parking_id
+                    )->pluck('id');
+                    if ($floorIds) {
+                        $query->whereIn('floor_id', $floorIds);
+                    } else {
+                        $query->where('id', 0);
+                    }
+                }
+            }
+
             // 分页
             $page = $request->input('page', 1);
             $perPage = $request->input('per_page', 10);
@@ -145,6 +160,7 @@ class ParkingSpaceController extends BaseController
         try {
             $data = [
                 'floor_data'      => AdminFloor::getData(),
+                'parking_list'    => Parking::getData(),
                 'space_type_data' => ParkingSpaceType::getData(),
                 'space_attr_data' => ParkingSpaceAttributes::getData(),
                 'status_data'     => get_select_child_data(
diff --git a/app/Services/ParkingSpaceService.php b/app/Services/ParkingSpaceService.php
index 12e5171..03ab208 100644
--- a/app/Services/ParkingSpaceService.php
+++ b/app/Services/ParkingSpaceService.php
@@ -4,6 +4,7 @@ namespace App\Services;
 
 use App\Exceptions\CustomException;
 use App\Models\AdminFloor;
+use App\Models\Parking;
 use App\Models\ParkingLicensePlate;
 use App\Models\ParkingSpace;
 use App\Models\ParkingSpaceAttributes;
@@ -159,6 +160,7 @@ class ParkingSpaceService extends BaseService
         $item['operation_type'] = $this->getOperationType(
             $item['operation_type']
         );
+        $item['parking_name'] = Parking::queryName($item['floor_id']);
         unset(
             $item['floor_id'], $item['space_attr_id'],
             $item['space_type_id'], $item['license_plate_id']