From cbeee0f7440e5f440c487155018aac547434b1c2 Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Wed, 7 Dec 2022 17:46:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E7=94=A8=E6=88=B7=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E6=9C=AA=E8=AE=BE=E7=BD=AE=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=99=BB=E5=BD=95=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin-vue3/src/router/index.ts       | 2 +-
 yudao-ui-admin-vue3/src/store/modules/user.ts | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/yudao-ui-admin-vue3/src/router/index.ts b/yudao-ui-admin-vue3/src/router/index.ts
index c73ae6694..4d2d079ea 100644
--- a/yudao-ui-admin-vue3/src/router/index.ts
+++ b/yudao-ui-admin-vue3/src/router/index.ts
@@ -55,7 +55,7 @@ router.beforeEach(async (to, from, next) => {
         const res = await listSimpleDictDataApi()
         dictStore.setDictMap(res)
       }
-      if (userStore.getRoles.length === 0) {
+      if (!userStore.getIsSetUser) {
         isRelogin.show = true
         const res = await getInfoApi()
         await userStore.setUserInfoAction(res)
diff --git a/yudao-ui-admin-vue3/src/store/modules/user.ts b/yudao-ui-admin-vue3/src/store/modules/user.ts
index e776e73c0..d4f4df55e 100644
--- a/yudao-ui-admin-vue3/src/store/modules/user.ts
+++ b/yudao-ui-admin-vue3/src/store/modules/user.ts
@@ -13,6 +13,7 @@ interface UserVO {
 interface UserInfoVO {
   permissions: string[]
   roles: string[]
+  isSetUser: boolean
   user: UserVO
 }
 
@@ -20,6 +21,7 @@ export const useUserStore = defineStore('admin-user', {
   state: (): UserInfoVO => ({
     permissions: [],
     roles: [],
+    isSetUser: false,
     user: {
       id: 0,
       avatar: '',
@@ -33,6 +35,9 @@ export const useUserStore = defineStore('admin-user', {
     getRoles(): string[] {
       return this.roles
     },
+    getIsSetUser(): boolean {
+      return this.isSetUser
+    },
     getUser(): UserVO {
       return this.user
     }
@@ -46,6 +51,7 @@ export const useUserStore = defineStore('admin-user', {
       this.permissions = userInfo.permissions
       this.roles = userInfo.roles
       this.user = userInfo.user
+      this.isSetUser = true
       wsCache.set(CACHE_KEY.USER, userInfo)
     },
     loginOut() {
@@ -56,6 +62,7 @@ export const useUserStore = defineStore('admin-user', {
     resetState() {
       this.permissions = []
       this.roles = []
+      this.isSetUser = false
       this.user = {
         id: 0,
         avatar: '',