From 645c926bbd52baa90c0a4af0d253047709c5e02c Mon Sep 17 00:00:00 2001
From: sxq <812980466@qq.com>
Date: 星期二, 22 六月 2021 16:06:02 +0800
Subject: [PATCH] 集成lock4j框架，删除redisson锁，使用lock4j的锁。
---
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