diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue index fe8450e16878b975245bbd604062b331273c265c..f0924d12ac21db91aefb242c9987c052abcd56df 100644 --- a/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue +++ b/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue @@ -395,7 +395,7 @@ } } - if (!this.role.role_id) this.getList(); + if (this.role.role_id) this.getList(); break; default: this.$notify({ diff --git a/app/Modules/Admin/Services/AuthService.php b/app/Modules/Admin/Services/AuthService.php index 75dbcc7aa13794a9904fb88b53923105bfb02a34..a290e268b1fef9e1ffe289cda278744868b287c1 100644 --- a/app/Modules/Admin/Services/AuthService.php +++ b/app/Modules/Admin/Services/AuthService.php @@ -67,6 +67,10 @@ class AuthService extends Service if (!$admin = Auth::guard($this->guard)->user()){ throw new AuthTokenException('认证失败!'); } + // 如果是admin_id = 1,那么默认返回全部权限 + if($admin->admin_id == 1){ + return list_to_tree(AdminMenu::getInstance()->getAllMenus()->toArray()); + } $admin = Admin::with(['roles.menus'])->find($admin->admin_id)->toArray(); $menus = [];