From 81fe98b62eaa2cd2788af7f9102095bfb8c09a13 Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Mon, 7 Apr 2025 17:31:04 +0800
Subject: [PATCH] fix: type error

---
 apps/web-antd/src/router/guard.ts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/apps/web-antd/src/router/guard.ts b/apps/web-antd/src/router/guard.ts
index cca219426..650d110cb 100644
--- a/apps/web-antd/src/router/guard.ts
+++ b/apps/web-antd/src/router/guard.ts
@@ -1,17 +1,18 @@
 import type { Router } from 'vue-router';
 
 import { DEFAULT_HOME_PATH, LOGIN_PATH } from '@vben/constants';
+import { $t } from '@vben/locales';
 import { preferences } from '@vben/preferences';
 import { useAccessStore, useUserStore } from '@vben/stores';
 import { startProgress, stopProgress } from '@vben/utils';
 
+import { message } from 'ant-design-vue';
+
+import { getSimpleDictDataList } from '#/api/system/dict/data';
 import { accessRoutes, coreRouteNames } from '#/router/routes';
 import { useAuthStore, useDictStore } from '#/store';
 
 import { generateAccess } from './access';
-import { message } from 'ant-design-vue';
-import { $t } from '@vben/locales';
-import { getSimpleDictDataList } from '#/api/system/dict/data';
 
 /**
  * 通用守卫配置
@@ -101,12 +102,15 @@ function setupAccessGuard(router: Router) {
     // 当前登录用户拥有的角色标识列表
     let userInfo = userStore.userInfo;
     if (!userInfo) {
-      // addy by 芋艿：由于 yudao 是 fetchUserInfo 统一加载用户 + 权限信息，所以将 fetchMenuListAsync
+      // add by 芋艿：由于 yudao 是 fetchUserInfo 统一加载用户 + 权限信息，所以将 fetchMenuListAsync
       const loading = message.loading({
         content: `${$t('common.loadingMenu')}...`,
       });
       try {
-        userInfo = (await authStore.fetchUserInfo()).user;
+        const authPermissionInfo = await authStore.fetchUserInfo();
+        if (authPermissionInfo) {
+          userInfo = authPermissionInfo.user;
+        }
       } finally {
         loading();
       }
@@ -128,7 +132,7 @@ function setupAccessGuard(router: Router) {
     userStore.setUserRoles(userRoles);
     const redirectPath = (from.query.redirect ??
       (to.path === DEFAULT_HOME_PATH
-        ? userInfo.homePath || DEFAULT_HOME_PATH
+        ? userInfo?.homePath || DEFAULT_HOME_PATH
         : to.fullPath)) as string;
 
     return {