From 75cc1af14dc216c68e8f48a4cb19f29bb7c0583f Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq.com>
Date: Thu, 25 Jun 2026 14:36:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E5=81=9C?=
 =?UTF-8?q?=E8=BD=A6=E5=9C=BA=E5=BF=85=E5=A1=AB=E5=8F=96=E6=B6=88=EF=BC=8C?=
 =?UTF-8?q?=E5=81=9C=E8=BD=A6=E8=B5=84=E8=AE=AF=E8=BF=94=E5=9B=9E=E8=BD=A6?=
 =?UTF-8?q?=E4=BD=8D=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Admin/ParkingSpaceController.php | 1 +
 app/Http/Controllers/Admin/UserController.php         | 2 --
 app/Services/AdminUsersService.php                    | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Admin/ParkingSpaceController.php b/app/Http/Controllers/Admin/ParkingSpaceController.php
index bde19ee..3dedb12 100644
--- a/app/Http/Controllers/Admin/ParkingSpaceController.php
+++ b/app/Http/Controllers/Admin/ParkingSpaceController.php
@@ -311,6 +311,7 @@ class ParkingSpaceController extends BaseController
             $data['license_plate'] = ParkingLicensePlate::getNumber($item['license_plate_id']);
             $data['status'] = $this->service->getParkingSpaceStatus($item['status'], $item['license_plate_id'], $parking_space_id);
             $data['parking_space_type'] = ParkingSpaceType::getName($item['space_type_id']);
+            $data['parking_space_attr'] = ParkingSpaceAttributes::getAttr($item['space_attr_id']);
             $data['berthing_time_str'] = '';
             if ($item['berthing_time']) {
                 $data['berthing_time_str'] = get_time_difference_str($item['berthing_time']);
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index ee97813..534a22e 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -137,7 +137,6 @@ class UserController extends BaseController
         $rules = [
             'username'   => 'required|alpha_num|between:4,20',
             'role_id'    => 'required|numeric',
-            'packing_id' => 'required|numeric',
             'password'   => 'required|between:12,30',
             'email'      => 'email'
         ];
@@ -146,7 +145,6 @@ class UserController extends BaseController
             'username.alpha_num'  => __('validation.admin_user.l_a_alpha_num'),
             'username.between'    => __('validation.admin_user.l_a_between'),
             'role_id.required'    => __('validation.admin_user.r_empty'),
-            'packing_id.required' => __('validation.admin_user.s_p_empty'),
             'password.required'   => __('validation.admin_user.p_empty'),
             'password.between'    => __('validation.admin_user.p_between'),
             'email.email'         => __('validation.admin_user.email'),
diff --git a/app/Services/AdminUsersService.php b/app/Services/AdminUsersService.php
index de781e3..542ffbd 100644
--- a/app/Services/AdminUsersService.php
+++ b/app/Services/AdminUsersService.php
@@ -63,7 +63,7 @@ final class AdminUsersService
                 'email'      => $data['email'] ?? '',
                 'position'   => $data['position'] ?? '',
                 'status'     => $data['status'],
-                'packing_id' => $data['packing_id'],
+                'packing_id' => $data['packing_id'] ?? 0,
                 'created_at' => get_datetime()
             ]);
 
@@ -116,7 +116,7 @@ final class AdminUsersService
                 'email'      => $data['email'] ?? '',
                 'position'   => $data['position'] ?? '',
                 'status'     => $data['status'],
-                'packing_id' => $data['packing_id'],
+                'packing_id' => $data['packing_id'] ?? 0,
                 'created_at' => get_datetime()
             ];
             if (isset($data['password']) && !empty($data['password'])) {