From 56050aa6501f3d9d2f79a2c40a28815878ac56ee Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 24 十一月 2022 15:14:47 +0800
Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复Log注解GET请求记录不到参数问题 * fix 修复某些特性的环境生成代码变乱码TXT文件问题 * update 消除Vue3控制台出现的警告信息 * fix 开启TopNav没有子菜单隐藏侧边栏 * fix 修复回显数据字典数组异常问题(I60UYQ) * update 忽略不必要的属性数据返回
---
ruoyi-ui/src/utils/permission.js | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/utils/permission.js b/ruoyi-ui/src/utils/permission.js
index ceca18f..bd4c066 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) {
@@ -46,4 +48,4 @@
console.error(`need roles! Like checkRole="['admin','editor']"`)
return false
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3