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 @@ export function checkPermi(value) { 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 @@ export function checkRole(value) { 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) {