提交

app/admin/controller/Admin.php

@@ -104,9 +104,12 @@ class Admin extends BaseController
                 return $this->error('用户名已存在');
             }
 
-            $role = AdminModel::getRole($params['role_id']);
+            $role = $params['is_kefu'] == 1 ? 3 : 2;//获取角色类型：1超管；2普管；3客服
 
             if (!empty($id)) {
+                if ($id == 1) {
+                    $role = 1;
+                }
                 unset($params['username']);
                 AdminModel::where('id', $id)->update($params);
                 User::where('uid', $id)->where('from', 0)->update(['role' => $role, 'realname' => $params['nickname'], 'phone' => $params['phone'], 'remark' => $params['remark']]);

app/admin/controller/User.php

@@ -21,7 +21,7 @@ class User extends BaseController
             $user_id = $params['user_id'] ?? '';
             $name = $params['name'] ?? '';
             
-            $query = new UserModel();
+            $query = UserModel::where('role', 0);
             if (!empty($user_id)) {
                 $query = $query->where('user_id', $user_id);
             }

app/admin/model/Admin.php

@@ -10,15 +10,6 @@ class Admin extends BaseModel
     protected $createTime = 'created_at';
     protected $updateTime = 'updated_at';
 
-    //获取角色类型：1超管；2普管；3客服
-    public static function getRole($role_id) {
-        $role_name = Role::where('id', $role_id)->value('name');
-        $role = !empty($role_id) ? 2 : 1;
-        if ($role_name && strpos($role_name, '客服') !== false) {
-            $role = 3;
-        }
-        return $role;
-    }
     public function role()
     {
     return $this->hasOne(Role::class, 'id', 'role_id')->field(['id', 'name']);

app/admin/validate/AdminValidate.php

@@ -15,6 +15,7 @@ class AdminValidate extends BaseValidate
         'id' => 'require',
         'username' => 'require|min:1',
         'nickname' => 'require|min:1',
+        'is_kefu'  => 'require|in:0,1',
         'password' => 'min:6',
         'phone' => 'length:0,20',
         'email' => 'email',
@@ -34,6 +35,7 @@ class AdminValidate extends BaseValidate
         'id' => 'id',
         'username' => '账号',
         'nickname' => '昵称',
+        'is_kefu'  => '是否是客服',
         'password' => '密码',
         'phone' => '手机号',
         'email' => '邮箱',
@@ -52,7 +54,7 @@ class AdminValidate extends BaseValidate
      */
     public function sceneAdd()
     {
-        return $this->only(['username', 'nickname', 'password', 'phone', 'email', 'sex', 'role_id', 'department_id', 'remark']);
+        return $this->only(['username', 'nickname', 'is_kefu', 'password', 'phone', 'email', 'sex', 'role_id', 'department_id', 'remark']);
     }
 
 
@@ -61,7 +63,7 @@ class AdminValidate extends BaseValidate
      */
     public function sceneEdit()
     {
-        return $this->only(['id','username', 'nickname', 'password', 'phone', 'email', 'sex', 'role_id', 'department_id', 'remark']);
+        return $this->only(['id','username', 'nickname', 'is_kefu', 'password', 'phone', 'email', 'sex', 'role_id', 'department_id', 'remark']);
     }
 
     public function sceneDel()

app/enterprise/model/User.php

@@ -144,9 +144,9 @@ class User extends BaseModel
              $userList = array_merge($userList, array_keys($friendList));
              
              $admin_id = request()->userInfo['uid'];
-             $department_user_ids = Department::getDepartmentCsUids($admin_id);//整个部门的用户
-             $department_user_ids[] = $user_id;
-             $cus=self::whereIn('cs_uid',$department_user_ids)->column('user_id');
+             $department_cs_uids = Department::getDepartmentCsUids($admin_id);//整个部门的用户
+             $department_cs_uids[] = $user_id;
+             $cus=self::whereIn('cs_uid',$department_cs_uids)->column('user_id');
              if($cus){
                 $userList=array_merge($userList,$cus);
              }