diff --git a/src/components/custom/tenant-select.vue b/src/components/custom/tenant-select.vue
index 2c86c4e1..de901880 100644
--- a/src/components/custom/tenant-select.vue
+++ b/src/components/custom/tenant-select.vue
@@ -3,7 +3,7 @@ import { computed, onMounted, ref } from 'vue';
 import type { SelectOption } from 'naive-ui';
 import { useLoading } from '@sa/hooks';
 import { fetchTenantList } from '@/service/api';
-import { fetchClearTenant } from '@/service/api/system/tenant';
+import { fetchChangeTenant, fetchClearTenant } from '@/service/api/system/tenant';
 import { useAppStore } from '@/store/modules/app';
 import { useTabStore } from '@/store/modules/tab';
 import { useAuthStore } from '@/store/modules/auth';
@@ -45,7 +45,7 @@ const showTenantSelect = computed<boolean>(() => {
 async function closeAndRefresh(msg: string, val: CommonType.IdType = '') {
   lastSelected.value = val;
   window.$message?.success(msg);
-  clearTabs();
+  clearTabs([], true);
   toHome();
   appStore.reloadPage(500);
 }
@@ -57,6 +57,7 @@ async function handleChangeTenant(_tenantId: CommonType.IdType) {
   if (lastSelected.value === _tenantId) {
     return;
   }
+  await fetchChangeTenant(_tenantId);
   closeAndRefresh('切换租户成功', _tenantId);
 }
 
diff --git a/src/layouts/modules/global-header/index.vue b/src/layouts/modules/global-header/index.vue
index 71156300..93c15ee2 100644
--- a/src/layouts/modules/global-header/index.vue
+++ b/src/layouts/modules/global-header/index.vue
@@ -1,8 +1,7 @@
 <script setup lang="ts">
-import { ref, watch } from 'vue';
+import { ref } from 'vue';
 import { useFullscreen } from '@vueuse/core';
 import { GLOBAL_HEADER_MENU_ID } from '@/constants/app';
-import { fetchChangeTenant } from '@/service/api/system/tenant';
 import { useAppStore } from '@/store/modules/app';
 import { useAuthStore } from '@/store/modules/auth';
 import { useThemeStore } from '@/store/modules/theme';
@@ -33,10 +32,6 @@ const themeStore = useThemeStore();
 const { isFullscreen, toggle } = useFullscreen();
 
 const tenantId = ref<CommonType.IdType>(authStore.userInfo?.user?.tenantId || '000000');
-
-watch(tenantId, async () => {
-  await fetchChangeTenant(tenantId.value);
-});
 </script>
 
 <template>
diff --git a/src/store/modules/tab/index.ts b/src/store/modules/tab/index.ts
index e6fe927c..ace7d7dc 100644
--- a/src/store/modules/tab/index.ts
+++ b/src/store/modules/tab/index.ts
@@ -129,13 +129,23 @@ export const useTabStore = defineStore(SetupStoreId.Tab, () => {
    *
    * @param excludes Exclude tab ids
    */
-  async function clearTabs(excludes: string[] = []) {
+  async function clearTabs(excludes: string[] = [], clearCache: boolean = false) {
     const remainTabIds = [...getFixedTabIds(tabs.value), ...excludes];
     const removedTabsIds = tabs.value.map(tab => tab.id).filter(id => !remainTabIds.includes(id));
 
     const isRemoveActiveTab = removedTabsIds.includes(activeTabId.value);
     const updatedTabs = filterTabsByIds(removedTabsIds, tabs.value);
 
+    if (clearCache) {
+      // 清除缓存
+      removedTabsIds.forEach(tabId => {
+        const tab = tabs.value.find(t => t.id === tabId);
+        if (tab) {
+          routeStore.resetRouteCache(tab.routeKey);
+        }
+      });
+    }
+
     function update() {
       tabs.value = updatedTabs;
     }