From 78bb30bb5fdd54eb34d88e3fd24098aeed29a7cc Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 27 九月 2024 16:15:17 +0800
Subject: [PATCH] 修复码生成上级菜单显示问题(I9CTIJ)
---
ruoyi-ui/src/utils/permission.js | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/utils/permission.js b/ruoyi-ui/src/utils/permission.js
index 784e379..0fc5515 100644
--- a/ruoyi-ui/src/utils/permission.js
+++ b/ruoyi-ui/src/utils/permission.js
@@ -9,15 +9,14 @@
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) {
- return false
- }
- return true
+ return hasPermission;
+
} else {
console.error(`need roles! Like checkPermi="['system:user:add','system:user:edit']"`)
return false
@@ -33,15 +32,14 @@
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) {
- return false
- }
- return true
+ return hasRole;
+
} else {
console.error(`need roles! Like checkRole="['admin','editor']"`)
return false
--
Gitblit v1.9.2