From dfdd0d196f7a9c2a16766bbc13f460654a1ddcd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=81=E5=86=9C=E5=B0=8F=E6=98=93?= <237972113@qq.com>
Date: Mon, 2 May 2022 09:25:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=97=A0=E9=9C=80=E6=A0=A1=E9=AA=8C=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/directive/permission/has.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/directive/permission/has.js b/ruoyi-ui/src/directive/permission/has.js
index cb3c14536..815ec5cd8 100644
--- a/ruoyi-ui/src/directive/permission/has.js
+++ b/ruoyi-ui/src/directive/permission/has.js
@@ -23,12 +23,19 @@ export default {
         if (Ps.length === 0 || Rs.length === 0){
             throw new Error(`请设置操作权限标签值`);
         }
+        
+        if (roles.some((role) => (super_admin === role))){
+            return;
+        }
+        if (permissions.some((permission) => (all_permission === permission))){
+            return;
+        }
 
         var expression = value;
 
         for (let i = 0; i < Rs.length; i++) {
             const hasRole = roles.some(role => {
-                return super_admin === role || Rs[i] === `R(${role})`;
+                return Rs[i] === `R(${role})`;
             })
 
             expression = hasRole ? expression.replace(Rs[i], 'true') : expression.replace(Rs[i], 'false');
@@ -36,7 +43,7 @@ export default {
 
         for (let i = 0; i < Ps.length; i++) {
             const hasPermi = permissions.some(permission => {
-                return all_permission === permission || Ps[i] === `P(${permission})`;
+                return Ps[i] === `P(${permission})`;
             })
 
             expression = hasPermi ? expression.replace(Ps[i], 'true') : expression.replace(Ps[i], 'false');