From 54e0d5fd52bb0cc71c31614daa2ee0b4bfaa4011 Mon Sep 17 00:00:00 2001
From: TermiNexus <wyt18222152539wyt@163.com>
Date: Thu, 13 Aug 2026 02:57:00 +0800
Subject: [PATCH] =?UTF-8?q?feat(company):=20=E7=A7=9F=E6=88=B7=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=94=AF=E6=8C=81=E8=8F=9C=E5=8D=95=E7=9B=B4=E8=BE=BE?=
 =?UTF-8?q?=EF=BC=88=E6=97=A0=E5=8F=82=E6=95=B0=E6=97=B6=E5=9B=9E=E9=80=80?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E8=A7=92=E8=89=B2=E7=A7=9F=E6=88=B7=EF=BC=89?=
 =?UTF-8?q?=EF=BC=8CAdminCheck=20=E7=B1=BB=E5=9E=8B=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/user.ts                 | 3 +++
 src/views/company/TenantDetail.vue | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/stores/user.ts b/src/stores/user.ts
index 54f52f2..a86a15d 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -13,6 +13,9 @@ export interface AdminCheckResult {
   is_tenant_admin?: boolean
   current_role_name?: string
   current_role_uuid?: string
+  current_company_uuid?: string
+  current_tenant_uuid?: string
+  has_current_company?: boolean
   role_scope?: {
     Type?: string
     TypeLabel?: string
diff --git a/src/views/company/TenantDetail.vue b/src/views/company/TenantDetail.vue
index 3a1cf46..7ed0893 100644
--- a/src/views/company/TenantDetail.vue
+++ b/src/views/company/TenantDetail.vue
@@ -27,13 +27,16 @@ import EntityPicker from '@/components/EntityPicker.vue'
 import { formApi } from '@/api/form'
 import { setPageTitle } from '@/utils/serverScope'
 import { formatUtcTime as formatTime } from '@/utils/dateTime'
+import { useUserStore } from '@/stores/user'
 import type { ColumnSchema } from '@/types/api'
 
 const route = useRoute()
 const router = useRouter()
+const userStore = useUserStore()
 
 // 路由参数：租户 UUID（computed 响应式：同一 tab 复用且 query 变化时自动更新）
-const tenantUUID = computed(() => (route.query.TenantUUID as string) || '')
+// 无 query 参数（从"租户管理 > 租户管理详情"菜单直达）时回退到当前角色的租户 UUID
+const tenantUUID = computed(() => (route.query.TenantUUID as string) || userStore.adminCheck?.current_tenant_uuid || '')
 
 // === 状态 ===
 const loading = ref(false)