From b51045cc1b11cd147d037720675c2616e0ad1fe3 Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Wed, 18 Dec 2024 14:06:36 +0800
Subject: [PATCH] fix: merge main userinfo error

---
 apps/web-antd/src/router/guard.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/web-antd/src/router/guard.ts b/apps/web-antd/src/router/guard.ts
index e7988eb8c..47ddc4518 100644
--- a/apps/web-antd/src/router/guard.ts
+++ b/apps/web-antd/src/router/guard.ts
@@ -109,10 +109,11 @@ function setupAccessGuard(router: Router) {
     accessStore.setAccessMenus(accessibleMenus);
     accessStore.setAccessRoutes(accessibleRoutes);
     accessStore.setIsAccessChecked(true);
-    const redirectPath = (from.query.redirect ??
-      (to.path === DEFAULT_HOME_PATH
-        ? userInfo.homePath || DEFAULT_HOME_PATH
-        : to.fullPath)) as string;
+    // const redirectPath = (from.query.redirect ??
+    //   (to.path === DEFAULT_HOME_PATH
+    //     ? userInfo.homePath || DEFAULT_HOME_PATH
+    //     : to.fullPath)) as string;
+    const redirectPath = (from.query.redirect ?? to.fullPath) as string;
 
     return {
       ...router.resolve(decodeURIComponent(redirectPath)),