diff --git a/src/pages/org/select.vue b/src/pages/org/select.vue
index e2b2988..a6845a5 100644
--- a/src/pages/org/select.vue
+++ b/src/pages/org/select.vue
@@ -43,11 +43,7 @@ export default defineComponent({
       if (!switched) {
         return;
       }
-      const currentAuthToken = window.localStorage.getItem(HtyAuthToken);
-      if (currentAuthToken) {
-        window.localStorage.setItem(HtySudoToken, currentAuthToken);
-      }
-      await router.replace("/");
+      window.location.assign("/");
     };
 
     return { orgs, onSelect };
diff --git a/src/store/org.ts b/src/store/org.ts
index c5a4559..83900c3 100644
--- a/src/store/org.ts
+++ b/src/store/org.ts
@@ -1,6 +1,6 @@
 import { reactive } from "vue";
 import request from "~/utils/request";
-import { CurrentOrgId, HtyAuthToken } from "~/utils";
+import { CurrentOrgId, HtyAuthToken, HtySudoToken } from "~/utils";
 import type { Organization } from "~/types";
 import { showFailToast } from "vant";
 
@@ -16,6 +16,28 @@ const store = reactive<OrgState>({
   homepageMd: "",
 });
 
+const parseCurrentOrgIdFromToken = (token: string): string | undefined => {
+  try {
+    const tokenParts = token.split(".");
+    if (tokenParts.length < 2) return undefined;
+    const payloadRaw = tokenParts[1].replace(/-/g, "+").replace(/_/g, "/");
+    const payloadRawWithPadding = payloadRaw.padEnd(
+      Math.ceil(payloadRaw.length / 4) * 4,
+      "="
+    );
+    const payloadJson = decodeURIComponent(
+      atob(payloadRawWithPadding)
+        .split("")
+        .map((char) => `%${(`00${char.charCodeAt(0).toString(16)}`).slice(-2)}`)
+        .join("")
+    );
+    const payload = JSON.parse(payloadJson);
+    return payload.current_org_id || undefined;
+  } catch (_error) {
+    return undefined;
+  }
+};
+
 export default function useOrg() {
   const loadMyOrgs = async () => {
     const { r, d, e } = await request({
@@ -41,9 +63,19 @@ export default function useOrg() {
       showFailToast(e);
       return false;
     }
+    if (typeof d !== "string") {
+      showFailToast("机构切换失败：返回 token 非法");
+      return false;
+    }
+    const tokenOrgId = parseCurrentOrgIdFromToken(d);
+    if (!tokenOrgId) {
+      showFailToast("机构切换失败：token 缺少机构上下文");
+      return false;
+    }
     window.localStorage.setItem(HtyAuthToken, d);
-    window.localStorage.setItem(CurrentOrgId, orgId);
-    store.currentOrgId = orgId;
+    window.localStorage.setItem(HtySudoToken, d);
+    window.localStorage.setItem(CurrentOrgId, tokenOrgId);
+    store.currentOrgId = tokenOrgId;
     return true;
   };