From e13a62c206b4d6aed6b9ad704a50acc9a7f8ac25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Wed, 9 Mar 2022 14:38:18 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=87=86=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/users/Role/RoleList/BaseRoleList.vue | 3 +--
 src/views/users/Role/RoleList/OrgRoleList.vue  | 1 +
 src/views/users/Role/RoleList/SysRoleList.vue  | 1 +
 src/views/users/Role/RoleList/index.vue        | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/users/Role/RoleList/BaseRoleList.vue b/src/views/users/Role/RoleList/BaseRoleList.vue
index edae61ac4..b2641d239 100644
--- a/src/views/users/Role/RoleList/BaseRoleList.vue
+++ b/src/views/users/Role/RoleList/BaseRoleList.vue
@@ -7,6 +7,7 @@ import { ListTable } from '@/components'
 import { DetailFormatter } from '@/components/TableFormatters'
 
 export default {
+  name: 'BaseRoleList',
   components: {
     ListTable
   },
@@ -90,8 +91,6 @@ export default {
       }
     }
   },
-  mounted() {
-  },
   methods: {
     hasPermNotBuiltinNotRootOrg(row, perm) {
       return !row['builtin'] && this.$hasPerm(perm) && !this.$isRootOrg()
diff --git a/src/views/users/Role/RoleList/OrgRoleList.vue b/src/views/users/Role/RoleList/OrgRoleList.vue
index aa1b90491..8c6c6d6b7 100644
--- a/src/views/users/Role/RoleList/OrgRoleList.vue
+++ b/src/views/users/Role/RoleList/OrgRoleList.vue
@@ -6,6 +6,7 @@
 import BaseRoleList from './BaseRoleList'
 
 export default {
+  name: 'OrgRoleList',
   components: {
     BaseRoleList
   },
diff --git a/src/views/users/Role/RoleList/SysRoleList.vue b/src/views/users/Role/RoleList/SysRoleList.vue
index d2d2c1c02..f5650813b 100644
--- a/src/views/users/Role/RoleList/SysRoleList.vue
+++ b/src/views/users/Role/RoleList/SysRoleList.vue
@@ -6,6 +6,7 @@
 import BaseRoleList from './BaseRoleList'
 
 export default {
+  name: 'SysRoleList',
   components: {
     BaseRoleList
   },
diff --git a/src/views/users/Role/RoleList/index.vue b/src/views/users/Role/RoleList/index.vue
index 90d93fcdf..f2641454e 100644
--- a/src/views/users/Role/RoleList/index.vue
+++ b/src/views/users/Role/RoleList/index.vue
@@ -3,7 +3,7 @@
     <div slot="title">
       {{ Title }}
     </div>
-    <keep-alive>
+    <keep-alive exclude="SysRoleList,OrgRoleList">
       <component :is="config.activeMenu" />
     </keep-alive>
   </TabPage>
@@ -29,7 +29,7 @@ export default {
             title: this.$t('route.OrgRole'),
             name: 'OrgRoleList',
             hidden: () => {
-              return !this.$store.getters.hasValidLicense
+              return !this.$store.getters.hasValidLicense || !this.$hasPerm('rbac.view_orgrole')
             }
           },
           {