From 4c57c2a04408fb8f9c0c08cf8d1919c76a90658c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 11 四月 2022 11:50:16 +0800
Subject: [PATCH] update springboot-admin 2.6.5 => 2.6.6 update qiniu 7.9.3 => 7.9.5 update qcloud 5.6.68 => 5.6.72 update minio 8.3.7 => 8.3.8 update okhttp 4.9.2 => 4.9.3

---
 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