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()) {