diff --git a/frontend/src/views/Login.vue b/frontend/src/views/Login.vue
index e7de1dc6..0c888c11 100644
--- a/frontend/src/views/Login.vue
+++ b/frontend/src/views/Login.vue
@@ -60,8 +60,8 @@ async function handleLogin() {
     const res: any = await authApi.login({ ...form, entity_id: Number(form.entity_id) })
     localStorage.setItem('cma_token', res.token)
     localStorage.setItem('cma_user', JSON.stringify(res.user))
-    localStorage.setItem('cma_entity_id', String(res.user?.entity_id ?? 1))
-    localStorage.setItem('cma_entity_name', res.user?.entity_short_name || res.user?.entity_name || '')
+    localStorage.setItem('cma_entity_id', String(res.entity_id ?? res.user?.entity_id ?? 1))
+    localStorage.setItem('cma_entity_name', res.entity_short_name || res.entity_name || '')
     router.push('/dashboard')
   } catch (e: any) {
     ElMessage.error(e?.response?.data?.detail || '登录失败')