|
@@ -232,22 +232,23 @@ class Admin extends Controller
|
|
|
return $this->error(HttpStatus::CUSTOM_ERROR, '超级管理员禁止操作');
|
|
return $this->error(HttpStatus::CUSTOM_ERROR, '超级管理员禁止操作');
|
|
|
}
|
|
}
|
|
|
$validator = [
|
|
$validator = [
|
|
|
- 'username' => 'required|string|max:50|alpha_dash|unique:admin,username',
|
|
|
|
|
|
|
+ 'username' => 'required|string|min:5|max:50|alpha_dash|unique:admin,username',
|
|
|
'nickname' => 'required|string|max:100',
|
|
'nickname' => 'required|string|max:100',
|
|
|
'password' => ['nullable', 'string', 'min:6', 'max:20'],
|
|
'password' => ['nullable', 'string', 'min:6', 'max:20'],
|
|
|
- // 'display_name' => 'nullable|string|max:100',
|
|
|
|
|
- // 'description' => 'nullable|string',
|
|
|
|
|
|
|
+ 'cellphone' => ['required', 'string'],
|
|
|
|
|
+ 'email' => ['required', 'email'],
|
|
|
|
|
+ 'remarks' => ['nullable', 'string'],
|
|
|
|
|
+ 'roles_ids' => ['nullable', 'array'],
|
|
|
|
|
+
|
|
|
];
|
|
];
|
|
|
if (isset($params['id']) && !empty($params['id'])) {
|
|
if (isset($params['id']) && !empty($params['id'])) {
|
|
|
- $validator['username'] = [
|
|
|
|
|
- 'required',
|
|
|
|
|
- 'string',
|
|
|
|
|
- 'max:50',
|
|
|
|
|
- 'alpha_dash',
|
|
|
|
|
|
|
+ if ($params['id'] > 1) {
|
|
|
|
|
+ $validator['roles_ids'] = ['required', 'array', 'min:1'];
|
|
|
|
|
+ $validator['roles_ids.*'] = ['required', 'integer', 'min:1'];
|
|
|
|
|
+ }
|
|
|
|
|
+ $validator['username'] = ['required', 'string', 'max:50', 'alpha_dash',
|
|
|
Rule::unique('admin', 'username')->ignore($params['id']), // 忽略当前 ID
|
|
Rule::unique('admin', 'username')->ignore($params['id']), // 忽略当前 ID
|
|
|
];
|
|
];
|
|
|
- } else {
|
|
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|