From f16875c9af2d51d6dba86234d63f86ac2d766bc4 Mon Sep 17 00:00:00 2001 From: 若依 <yzz_ivy@163.com> Date: 星期二, 28 十一月 2023 12:04:36 +0800 Subject: [PATCH] !799 update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java. Merge pull request !799 from 张利/N/A --- ruoyi-ui/src/utils/permission.js | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ruoyi-ui/src/utils/permission.js b/ruoyi-ui/src/utils/permission.js index 784e379..25d1a02 100644 --- a/ruoyi-ui/src/utils/permission.js +++ b/ruoyi-ui/src/utils/permission.js @@ -9,9 +9,10 @@ if (value && value instanceof Array && value.length > 0) { const permissions = store.getters && store.getters.permissions const permissionDatas = value + const all_permission = "*:*:*"; const hasPermission = permissions.some(permission => { - return permissionDatas.includes(permission) + return all_permission === permission || permissionDatas.includes(permission) }) if (!hasPermission) { @@ -33,9 +34,10 @@ if (value && value instanceof Array && value.length > 0) { const roles = store.getters && store.getters.roles const permissionRoles = value + const super_admin = "admin"; const hasRole = roles.some(role => { - return permissionRoles.includes(role) + return super_admin === role || permissionRoles.includes(role) }) if (!hasRole) { -- Gitblit v1.9.2