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(