From 9ae70960515ef593bc7618efbd3a09a2f279609a Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Thu, 18 Nov 2021 14:26:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=EF=BC=8Cstring=E5=85=B3=E9=94=AE=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Middleware/Permissions.php | 24 ++++++++++++------------
 app/Models/Admin/Administrator.php   |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/Admin/Middleware/Permissions.php b/app/Admin/Middleware/Permissions.php
index 868e0787..18c1466f 100644
--- a/app/Admin/Middleware/Permissions.php
+++ b/app/Admin/Middleware/Permissions.php
@@ -4,10 +4,10 @@ namespace App\Admin\Middleware;
 
 use Closure;
 use Dcat\Admin\Admin;
-use Illuminate\Http\Request;
 use Dcat\Admin\Http\Middleware\Authenticate;
 use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Support\Helper;
+use Illuminate\Http\Request;
 
 class Permissions
 {
@@ -23,18 +23,18 @@ class Permissions
         $routeName = $request->route()->getName();
         $user = Admin::user();
 
-        if (!$this->shouldPassThrough($request) //路由是否是白名单
-            && !$user?->hasPermission($routeName)//是否有权限
-        ) {
-            if (Helper::isAjaxRequest()) {
-                abort(403, trans('admin.deny'));
-            }
-
-            admin_exit(
-                Content::make()->withError(trans('admin.deny'))
-            );
+        if ($this->shouldPassThrough($request) //路由白名单
+            || $user->hasPermission($routeName)) {//有权限
+            return $next($request);
         }
-        return $next($request);
+
+        if (Helper::isAjaxRequest()) {
+            abort(403, trans('admin.deny'));
+        }
+
+        admin_exit(
+            Content::make()->withError(trans('admin.deny'))
+        );
     }
 
     /**
diff --git a/app/Models/Admin/Administrator.php b/app/Models/Admin/Administrator.php
index f65fa52a..d3b754cd 100644
--- a/app/Models/Admin/Administrator.php
+++ b/app/Models/Admin/Administrator.php
@@ -6,7 +6,7 @@ use Dcat\Admin\Models\Administrator as DcatAdministrator;
 
 class Administrator extends DcatAdministrator
 {
-    public function hasPermission(String $slug): bool
+    public function hasPermission(string $slug): bool
     {
         //判断是否是超级管理员
         if ($this->isAdministrator()) {