diff --git a/catch/permissions/model/DataRangScopeTrait.php b/catch/permissions/model/DataRangScopeTrait.php index 4084e7c..b12e0fd 100644 --- a/catch/permissions/model/DataRangScopeTrait.php +++ b/catch/permissions/model/DataRangScopeTrait.php @@ -39,14 +39,14 @@ trait DataRangScopeTrait break; case Roles::SELF_CHOOSE: $departmentIds = array_merge(array_column($role->getDepartments()->toArray(), 'id')); - $userIds = array_merge($userIds, Users::getUserIdsByDepartmentIds($departmentIds)); + $userIds = array_merge($userIds, $this->getUserIdsByDepartmentId($departmentIds)); break; case Roles::SELF_DATA: $userIds[] = $user->id; break; case Roles::DEPARTMENT_DOWN_DATA: case Roles::DEPARTMENT_DATA: - $userIds = array_merge($userIds, Users::getUserIdsByDepartmentIds([$user->department_id])); + $userIds = array_merge($userIds, $this->getUserIdsByDepartmentId([$user->department_id])); break; default: break; @@ -60,4 +60,16 @@ trait DataRangScopeTrait return $userIds; } + + /** + * 获取UserID + * + * @time 2020年07月04日 + * @param $id + * @return array + */ + protected function getUserIdsByDepartmentId(array $id) + { + return Users::whereIn('department_id', $id)->column('id'); + } } \ No newline at end of file