From b679381946aa98648cd7ad5221f3b9f4c389fc5b Mon Sep 17 00:00:00 2001
From: Qiufeng <qiufengawa@users.noreply.github.com>
Date: Mon, 17 Aug 2026 23:03:03 +0800
Subject: [PATCH] fix: keep brand navigation in active workbench

---
 frontend/e2e/system-update.e2e.ts             | 10 ++++++++
 frontend/src/layouts/components/Header.vue    |  2 +-
 frontend/src/layouts/components/SideNav.vue   |  5 ++--
 frontend/src/pages/role-select/index.vue      | 11 +-------
 frontend/src/store/modules/user.ts            |  2 ++
 frontend/src/store/modules/workbench-route.ts | 13 ++++++++++
 frontend/tests/user-workbench-route.test.ts   | 25 +++++++++++++++++++
 7 files changed, 55 insertions(+), 13 deletions(-)
 create mode 100644 frontend/src/store/modules/workbench-route.ts
 create mode 100644 frontend/tests/user-workbench-route.test.ts

diff --git a/frontend/e2e/system-update.e2e.ts b/frontend/e2e/system-update.e2e.ts
index cd7f758..16e08af 100644
--- a/frontend/e2e/system-update.e2e.ts
+++ b/frontend/e2e/system-update.e2e.ts
@@ -178,6 +178,16 @@ test('system administrator checks and queues a signed online update', async ({ p
   expect(installBodies).toEqual([{ version: '1.0.0-preview.2', reason: '管理员确认立即重启' }]);
 });
 
+test('brand logo returns the active identity to its workbench', async ({ page }) => {
+  await installFixture(page, [], []);
+  await page.goto('/governance/update');
+
+  await page.locator('.brand-logo').click();
+
+  await expect(page).toHaveURL(/\/governance\/settings$/);
+  await expect(page.getByText('选择工作身份', { exact: true })).toHaveCount(0);
+});
+
 test('disabled online updates expose status without an executable check action', async ({ page }) => {
   await installFixture(page, [], [], false);
   await page.goto('/governance/update');
diff --git a/frontend/src/layouts/components/Header.vue b/frontend/src/layouts/components/Header.vue
index cf41aae..d040c44 100644
--- a/frontend/src/layouts/components/Header.vue
+++ b/frontend/src/layouts/components/Header.vue
@@ -2,7 +2,7 @@
   <div :class="layoutCls">
     <t-head-menu :class="menuCls" :theme="menuTheme" expand-type="popup" :value="active">
       <template #logo>
-        <span v-if="showLogo" class="header-logo-container" @click="handleNav('/role-select')">
+        <span v-if="showLogo" class="header-logo-container" @click="handleNav(user.workbenchRoute)">
           <span class="header-brand">财务系统</span>
         </span>
         <div v-else class="header-operate-left">
diff --git a/frontend/src/layouts/components/SideNav.vue b/frontend/src/layouts/components/SideNav.vue
index e68a6f2..db10a5d 100644
--- a/frontend/src/layouts/components/SideNav.vue
+++ b/frontend/src/layouts/components/SideNav.vue
@@ -45,7 +45,7 @@ import { useRouter } from 'vue-router';
 import { prefix } from '@/config/global';
 import { t } from '@/locales';
 import { getActive } from '@/router';
-import { useSettingStore } from '@/store';
+import { useSettingStore, useUserStore } from '@/store';
 import type { MenuRoute, ModeType } from '@/types/interface';
 
 import pgk from '../../../package.json';
@@ -155,6 +155,7 @@ const menuCls = computed(() => {
 
 const router = useRouter();
 const settingStore = useSettingStore();
+const userStore = useUserStore();
 
 const autoCollapsed = () => {
   const isCompact = window.innerWidth <= MIN_POINT;
@@ -175,7 +176,7 @@ onUnmounted(() => {
 });
 
 const goHome = () => {
-  router.push('/role-select');
+  router.push(userStore.workbenchRoute);
 };
 </script>
 <style lang="less" scoped>
diff --git a/frontend/src/pages/role-select/index.vue b/frontend/src/pages/role-select/index.vue
index 460719c..d8d4442 100644
--- a/frontend/src/pages/role-select/index.vue
+++ b/frontend/src/pages/role-select/index.vue
@@ -73,16 +73,7 @@ const choose = async (roleCode: string) => {
   try {
     await userStore.selectRole(roleCode);
     permissionStore.initRoutes();
-    const target = userStore.roles.find((role) => role.code === roleCode)?.workbenchRoute;
-    const fallback =
-      roleCode === 'PROJECT_MANAGER'
-        ? '/workbench/project'
-        : roleCode === 'ARCHIVE_MANAGER'
-          ? '/workbench/archive'
-          : roleCode === 'SYSTEM_ADMIN'
-            ? '/governance/settings'
-            : '/workbench/finance';
-    await router.replace(target || fallback);
+    await router.replace(userStore.workbenchRoute);
   } catch (error) {
     MessagePlugin.error((error as Error).message || '身份选择失败，请重试');
   } finally {
diff --git a/frontend/src/store/modules/user.ts b/frontend/src/store/modules/user.ts
index 50ab60f..74d2323 100644
--- a/frontend/src/store/modules/user.ts
+++ b/frontend/src/store/modules/user.ts
@@ -5,6 +5,7 @@ import * as authApi from '@/api/auth';
 import { usePermissionStore } from '@/store';
 
 import { hasPermissionAccess } from './menu-access';
+import { resolveWorkbenchRoute } from './workbench-route';
 
 const emptyUser: UserView = {
   publicId: '',
@@ -28,6 +29,7 @@ export const useUserStore = defineStore('user', {
   getters: {
     displayName: (state) => state.user.displayName || state.user.username,
     roleName: (state) => state.roles.find((role) => role.code === state.currentRole)?.name || '',
+    workbenchRoute: (state) => resolveWorkbenchRoute(state.currentRole, state.roles),
     hasRole: (state) => (roleCode: string) => state.roles.some((role) => role.code === roleCode),
     hasPermission: (state) => (permission: string) =>
       hasPermissionAccess(state.currentRole, state.permissions, permission),
diff --git a/frontend/src/store/modules/workbench-route.ts b/frontend/src/store/modules/workbench-route.ts
new file mode 100644
index 0000000..73581d8
--- /dev/null
+++ b/frontend/src/store/modules/workbench-route.ts
@@ -0,0 +1,13 @@
+import type { RoleView } from '@/api/auth';
+
+const fallbackWorkbenchRoutes: Record<string, string> = {
+  PROJECT_MANAGER: '/workbench/project',
+  FINANCE_MANAGER: '/workbench/finance',
+  ARCHIVE_MANAGER: '/workbench/archive',
+  SYSTEM_ADMIN: '/governance/settings',
+};
+
+export function resolveWorkbenchRoute(currentRole: string | null, roles: RoleView[]): string {
+  const configured = roles.find((role) => role.code === currentRole)?.workbenchRoute?.trim();
+  return configured || fallbackWorkbenchRoutes[currentRole || ''] || '/role-select';
+}
diff --git a/frontend/tests/user-workbench-route.test.ts b/frontend/tests/user-workbench-route.test.ts
new file mode 100644
index 0000000..b1176b2
--- /dev/null
+++ b/frontend/tests/user-workbench-route.test.ts
@@ -0,0 +1,25 @@
+import { describe, expect, it } from 'vitest';
+
+import type { RoleView } from '../src/api/auth';
+import { resolveWorkbenchRoute } from '../src/store/modules/workbench-route';
+
+const roles: RoleView[] = [
+  { code: 'SYSTEM_ADMIN', name: '系统管理员', workbenchRoute: '/governance/settings' },
+  { code: 'FINANCE_MANAGER', name: '财务管理人员', workbenchRoute: '/workbench/finance' },
+];
+
+describe('active identity workbench route', () => {
+  it('uses the route supplied for the active role', () => {
+    expect(resolveWorkbenchRoute('SYSTEM_ADMIN', roles)).toBe('/governance/settings');
+    expect(resolveWorkbenchRoute('FINANCE_MANAGER', roles)).toBe('/workbench/finance');
+  });
+
+  it('falls back to the built-in role workbench when the server route is absent', () => {
+    expect(resolveWorkbenchRoute('PROJECT_MANAGER', [])).toBe('/workbench/project');
+    expect(resolveWorkbenchRoute('ARCHIVE_MANAGER', [])).toBe('/workbench/archive');
+  });
+
+  it('keeps role selection for sessions without an active identity', () => {
+    expect(resolveWorkbenchRoute(null, roles)).toBe('/role-select');
+  });
+});