diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index acd5d71..9ef772e 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -160,6 +160,8 @@ class UserController extends BaseController ]; if ($id) { $this->validateId($id, AdminUsers::class); + $rules['password'] = 'between:12,30'; + unset($messages['password.required']); $rules['status'] = 'required|in:0,1'; $messages['status.required'] = __('validation.admin_user.s_empty'); $messages['status.in'] = __('validation.admin_user.s_in'); diff --git a/app/Services/AdminUsersService.php b/app/Services/AdminUsersService.php index 4686d3c..134492f 100644 --- a/app/Services/AdminUsersService.php +++ b/app/Services/AdminUsersService.php @@ -97,9 +97,8 @@ final class AdminUsersService } $model = AdminUsers::findOrFail($id); $oldValue = $model->toArray(); - $model->update([ + $update = [ 'username' => $data['username'], - 'password' => Hash::make($data['password']), 'name' => $data['name'], 'avatar' => '', 'email' => $data['email'] ?? '', @@ -107,7 +106,11 @@ final class AdminUsersService 'status' => $data['status'], 'packing_id' => $data['packing_id'], 'created_at' => get_datetime() - ]); + ]; + if (isset($data['password']) && !empty($data['password'])) { + $update['password'] = Hash::make($data['password']); + } + $model->update($update); // 角色id $role_id = $data['role_id'];