From c2da2e5806769f161c66bc9f7a054ae1abe7af40 Mon Sep 17 00:00:00 2001 From: JaguarJack Date: Sat, 4 Jul 2020 14:28:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- catch/permissions/model/DataRangScopeTrait.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) 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