diff --git a/app/Http/Controllers/Admin/ParkingSpaceCatMapController.php b/app/Http/Controllers/Admin/ParkingSpaceCatMapController.php index 3e6aeab..7c03c60 100644 --- a/app/Http/Controllers/Admin/ParkingSpaceCatMapController.php +++ b/app/Http/Controllers/Admin/ParkingSpaceCatMapController.php @@ -201,13 +201,11 @@ class ParkingSpaceCatMapController extends BaseController $item['attr_color'] = $ParkingColor ? $ParkingColor['color_vacant'] : $ParkingType['default_color_vacant']; - $item['car_color'] = ''; - $item['car_no'] = ''; + $item['car_color'] = $ParkingColor + ? $ParkingColor['color_occupy'] + : $ParkingType['default_color_occupy']; + $item['car_color_value'] = $colorArr[$item['car_color']] ?? ''; if ($item['has_ar']) { - $item['car_color'] = $ParkingColor - ? $ParkingColor['color_occupy'] - : $ParkingType['default_color_occupy']; - $item['car_color_value'] = $colorArr[$item['car_color']] ?? ''; $item['car_no'] = ParkingLicensePlate::getNumber( $ParkingSpace['license_plate_id'] );