From 17382e8fdfb4385906594a2d24bbd06f1bcc7eaf Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq.com>
Date: Fri, 3 Jul 2026 17:14:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E8=BD=A6=E4=BD=8D=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=BC=96=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/ParkingSpaceRepairController.php    | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Admin/ParkingSpaceRepairController.php b/app/Http/Controllers/Admin/ParkingSpaceRepairController.php
index ce3dcc1..bbdfe0c 100644
--- a/app/Http/Controllers/Admin/ParkingSpaceRepairController.php
+++ b/app/Http/Controllers/Admin/ParkingSpaceRepairController.php
@@ -182,7 +182,7 @@ class ParkingSpaceRepairController extends BaseController
     {
         try {
             $data = [
-                'parking_space_list' => ParkingSpace::getFloorData()
+                'parking_list' => Parking::getData()
             ];
             return $this->responseService->success($data);
         } catch (Exception $e) {
@@ -201,8 +201,8 @@ class ParkingSpaceRepairController extends BaseController
         try {
             $this->validateId($id, ParkingSpaceRepair::class);
             $data = [
-                'parking_space_list' => ParkingSpace::getFloorData(),
-                'item'               => ParkingSpaceRepair::query()->find($id, [
+                'parking_list' => Parking::getData(),
+                'item'         => ParkingSpaceRepair::query()->find($id, [
                     'id',
                     'space_id',
                     'start_at',
@@ -212,11 +212,17 @@ class ParkingSpaceRepairController extends BaseController
             $ParkingSpace = ParkingSpace::query()->find(
                 $data['item']['space_id']
             );
-            $data['item']['parking_space_name'] = $ParkingSpace['number'];
-            $data['item']['floor'] = AdminFloor::getName(
-                $ParkingSpace['floor_id']
-            );
-            unset($data['item']['space_id']);
+            $floor_id = '';
+            $parking_id = '';
+            if ($ParkingSpace) {
+                $floor_id = $ParkingSpace['floor_id'];
+                $floorData = AdminFloor::getFirst($floor_id);
+                if ($floorData) {
+                    $parking_id = $floorData['building_floor'];
+                }
+            }
+            $data['item']['floor_id'] = $floor_id;
+            $data['item']['parking_id'] = $parking_id;
             return $this->responseService->success($data);
         } catch (Exception $e) {
             return $this->responseService->systemError(