lh 3 недель назад
Родитель
Сommit
05b307bd9e

+ 2 - 2
app/Http/Controllers/Manage/ManageUserController.php

@@ -70,7 +70,7 @@ class ManageUserController extends BaseController
             'nickname'   => 'required|string|max:100',
             'pwd'        => 'required|string|min:6|max:32',
             'is_enabled' => 'required|integer|in:0,1',
-            'role'       => 'required|string|in:admin,user',
+            'role'       => 'nullable|string|in:admin,user',
             'cpid'       => 'nullable|integer|min:1',
         ], [
             'account.required'    => '请传入账号',
@@ -82,8 +82,8 @@ class ManageUserController extends BaseController
             'pwd.max'             => '密码长度不能超过32位',
             'is_enabled.required' => '请传入是否启用',
             'is_enabled.in'       => 'is_enabled仅支持0或1',
-            'role.required'       => '请传入角色',
             'role.in'             => '角色仅支持admin(公司1管理员)或user(组员)',
+            'role.string'         => '角色参数不合法',
             'cpid.integer'        => 'cpid必须为整数',
             'cpid.min'            => 'cpid不能小于1',
         ]);

+ 5 - 0
app/Services/Manage/ManageUserService.php

@@ -92,6 +92,11 @@ class ManageUserService
         $isEnabled = (int)getProp($params, 'is_enabled', 1);
         $newRole   = (string)getProp($params, 'role', '');
 
+        // 未传角色时默认组员(管理员/超管添加账号均默认为 user)
+        if ($newRole === '') {
+            $newRole = 'user';
+        }
+
         if ($account === '') {
             Utils::throwError('1002:请传入账号');
         }