修改用户模块

catch/user/controller/User.php

@@ -46,17 +46,16 @@ class User extends CatchController
    */
     public function info(CatchAuth $auth)
     {
-
         $user = $auth->user();
 
         $roles = $user->getRoles();
 
-        $user->permissions = Permissions::whereIn('id', $user->getPermissionsBy())
-                                        ->field(['permission_name as title', 'route', 'icon'])
-                                        ->select();
+        $user->permissions = Permissions::getCurrentUserPermissions();
 
         $user->roles = $roles;
 
+        dd(Roles::getDepartmentUserIdsBy($roles));
+
         return CatchResponse::success($user);
     }
 

catch/user/model/Users.php

@@ -82,4 +82,18 @@ class Users extends CatchModel
 
         return array_unique($permissionIds);
     }
+
+  /**
+   * 获取部门下的用户
+   *
+   * @time 2020年01月14日
+   * @param $deptIds
+   * @return mixed
+   */
+    public static function getUserIdsByDepartmentIds($deptIds)
+    {
+        $ids = parent::whereIn('id', $deptIds)->value('id');
+        
+        return $ids ? $ids->toArray() : [];
+    }
 }