0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复数据权限 bug

Browse Source
This commit is contained in:
JaguarJack 2020-07-04 14:28:59 +08:00
parent 6e1be051e2
commit c2da2e5806
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
catch/permissions/model/DataRangScopeTrait.php
View File

@ -39,14 +39,14 @@ trait DataRangScopeTrait
break; break;
case Roles::SELF_CHOOSE: case Roles::SELF_CHOOSE:
$departmentIds = array_merge(array_column($role->getDepartments()->toArray(), 'id')); $departmentIds = array_merge(array_column($role->getDepartments()->toArray(), 'id'));
$userIds = array_merge($userIds, Users::getUserIdsByDepartmentIds($departmentIds)); $userIds = array_merge($userIds, $this->getUserIdsByDepartmentId($departmentIds));
break; break;
case Roles::SELF_DATA: case Roles::SELF_DATA:
$userIds[] = $user->id; $userIds[] = $user->id;
break; break;
case Roles::DEPARTMENT_DOWN_DATA: case Roles::DEPARTMENT_DOWN_DATA:
case Roles::DEPARTMENT_DATA: case Roles::DEPARTMENT_DATA:
$userIds = array_merge($userIds, Users::getUserIdsByDepartmentIds([$user->department_id])); $userIds = array_merge($userIds, $this->getUserIdsByDepartmentId([$user->department_id]));
break; break;
default: default:
break; break;
@ -60,4 +60,16 @@ trait DataRangScopeTrait
return $userIds; return $userIds;
} }
/**
* 获取UserID
*
* @time 2020年07月04日
* @param $id
* @return array
*/
protected function getUserIdsByDepartmentId(array $id)
{
return Users::whereIn('department_id', $id)->column('id');
}
} }