update:优化用户的部门搜索，减少SQL

catch/permissions/model/Department.php

@@ -40,25 +40,22 @@ class Department extends CatchModel
                     ->select()->toTree();
     }
 
-
     /**
-     * 获取部门
+     * 获取子部门IDS
      *
      * @time 2020年11月04日
-     * @param array $departmentIds
+     * @param $id
      * @throws DbException
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
-     * @return array
+     * @return mixed
      */
-    public static function getAllChildrenIds(array $departmentIds)
+    public static function getChildrenDepartmentIds($id)
     {
-        $childDepartmentIds = self::whereIn('parent_id', $departmentIds)->column('id');
+        $departmentIds = Department::field(['id', 'parent_id'])->select()->getAllChildrenIds([$id]);
 
-        if (!empty($childDepartmentIds)) {
+        $departmentIds[] = $id;
-            $childDepartmentIds = array_merge($childDepartmentIds, self::getAllChildrenIds($childDepartmentIds));
-        }
 
-        return $childDepartmentIds;
+        return $departmentIds;
     }
 }

catch/permissions/model/search/UserSearch.php

@@ -20,12 +20,20 @@ trait UserSearch
         return $query->where($this->aliasField('status'), $value);
     }
 
+    /**
+     * 查询部门下的用户
+     *
+     * @time 2020年11月04日
+     * @param $query
+     * @param $value
+     * @param $data
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @return mixed
+     */
     public function searchDepartmentIdAttr($query, $value, $data)
     {
-        $departmentIds = Department::getAllChildrenIds([$value]);
+        return $query->whereIn($this->aliasField('department_id'), Department::getChildrenDepartmentIds($value));
-
-        $departmentIds[] = intval($value);
-
-        return $query->whereIn($this->aliasField('department_id'), $departmentIds);
     }
 }