From f17570deef1364efa9c6e455b25559fbf1c3409b Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Mon, 12 Oct 2020 10:18:51 +0800
Subject: [PATCH] =?UTF-8?q?uodate:=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=EF=BC=8C=E6=97=A0=E9=9C=80?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 catch/permissions/model/DataRangScopeTrait.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 <njphper@gmail.com>
      * @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: