diff --git a/catch/permissions/model/DataRangScopeTrait.php b/catch/permissions/model/DataRangScopeTrait.php index 4e9d4b7..f0e2eac 100644 --- a/catch/permissions/model/DataRangScopeTrait.php +++ b/catch/permissions/model/DataRangScopeTrait.php @@ -13,7 +13,7 @@ trait DataRangScopeTrait * @author JaguarJack * @date 2020/6/6 */ - protected function dataRange($roles) + public function dataRange($roles = []) { if (Utils::isSuperAdmin()) { return $this; @@ -44,6 +44,10 @@ trait DataRangScopeTrait $user = request()->user(); + if (empty($roles)) { + $roles = $user->getRoles(); + } + foreach ($roles as $role) { switch ($role->data_range) { case Roles::ALL_DATA: