diff --git a/app/admin/library/Auth.php b/app/admin/library/Auth.php index afaf449722c85b94b9240ecddd6dfdd31e45bc69..d9cdc443175bca856d6865b3b28bd0c6b5e1c47b 100644 --- a/app/admin/library/Auth.php +++ b/app/admin/library/Auth.php @@ -293,25 +293,20 @@ class Auth } } else { - if (!Event::hasListener('cmscategoryPermissions')) { - throw new \Exception('请安装CMS插件'); - } else { - - if (!$this->superAdmin()) { - if (!empty($auth_nodes[$class])) { - $list = Event::emit('cmscategoryPermissions', [ - 'field' => $this->authFields, - 'nodes' => $auth_nodes[$class] - ], true); - } - } - - if (empty($list)) { + if (!$this->superAdmin()) { + if (!empty($auth_nodes[$class])) { $list = Event::emit('cmscategoryPermissions', [ - 'field' => $this->authFields + 'field' => $this->authFields, + 'nodes' => $auth_nodes[$class] ], true); } } + + if (empty($list)) { + $list = Event::emit('cmscategoryPermissions', [ + 'field' => $this->authFields + ], true); + } } return $tree ? ($list ? json_encode(list_to_tree($list)) : json_encode([])) : $list;