From 89a49cf19c8935a03fefccc3cf95d88b8565eb13 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 28 May 2026 23:38:46 +0800
Subject: [PATCH] =?UTF-8?q?refactor(frontend):=20=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=20ID=20?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 getCurrentUserId 到 utils/auth
- 替换 IM、CRM、BPM、MES、Mall 等模块中直接读取 userStore.getUser.id 的写法
- 移除 IM 内部 currentUser 工具依赖，统一从全局 auth 工具获取当前用户编号
- 保留 userStore 对昵称、头像、部门等非 ID 字段的读取
---
 .../FormCreate/src/components/useApiSelect.tsx    |  6 ++----
 src/utils/auth.ts                                 |  6 ++++++
 src/views/bpm/model/CategoryDraggableModel.vue    |  5 ++---
 src/views/bpm/model/form/index.vue                |  5 ++---
 .../detail/ProcessInstanceOperationButton.vue     |  4 ++--
 src/views/crm/business/BusinessForm.vue           |  4 ++--
 src/views/crm/clue/ClueForm.vue                   |  4 ++--
 src/views/crm/contact/ContactForm.vue             |  4 ++--
 src/views/crm/contract/ContractForm.vue           |  4 ++--
 src/views/crm/customer/CustomerForm.vue           |  4 ++--
 src/views/crm/customer/CustomerImportForm.vue     |  4 ++--
 .../crm/permission/components/PermissionList.vue  | 15 ++++++++-------
 src/views/crm/product/ProductForm.vue             |  4 ++--
 src/views/crm/receivable/ReceivableForm.vue       |  4 ++--
 .../crm/receivable/plan/ReceivablePlanForm.vue    |  4 ++--
 .../im/home/components/friend/FriendAddDialog.vue |  2 +-
 src/views/im/home/components/group/GroupInfo.vue  |  5 ++---
 .../components/group/GroupMemberAddDialog.vue     |  5 ++---
 .../im/home/components/rtc/RtcCallContainer.vue   |  2 +-
 .../components/rtc/RtcCallMemberPickerDialog.vue  |  2 +-
 .../im/home/components/rtc/RtcGroupCallBanner.vue |  2 +-
 .../im/home/components/user/UserInfoCard.vue      |  5 ++---
 src/views/im/home/composables/useMediaUploader.ts |  5 ++---
 src/views/im/home/composables/useMessagePuller.ts |  2 +-
 src/views/im/home/composables/useMessageSender.ts |  5 ++---
 src/views/im/home/composables/useMuteOverlay.ts   |  5 ++---
 .../im/home/pages/contact/FriendRequestDetail.vue |  2 +-
 .../im/home/pages/contact/FriendRequestList.vue   |  2 +-
 .../conversation/ConversationGroupSide.vue        |  5 ++---
 .../components/input/MentionPicker.vue            |  5 ++---
 .../components/input/MessageInput.vue             |  5 ++---
 .../components/message/GroupPinnedMessage.vue     |  5 ++---
 .../components/message/GroupRequestPending.vue    |  5 ++---
 .../components/message/MessageItem.vue            |  9 +++++----
 src/views/im/home/store/channelStore.ts           | 12 +++++-------
 src/views/im/home/store/conversationStore.ts      |  2 +-
 src/views/im/home/store/friendStore.ts            |  2 +-
 src/views/im/home/store/groupStore.ts             |  2 +-
 src/views/im/home/store/messageStore.ts           |  2 +-
 src/views/im/home/store/rtcStore.ts               |  2 +-
 src/views/im/home/store/websocketStore.ts         | 12 ++++--------
 src/views/im/utils/db.ts                          |  2 +-
 src/views/im/utils/message.ts                     |  2 +-
 src/views/im/utils/user.ts                        |  9 +--------
 .../mall/trade/delivery/pickUpOrder/index.vue     |  4 ++--
 .../mes/dv/maintenrecord/MaintenRecordForm.vue    |  5 ++---
 .../mes/pro/andon/record/AndonRecordForm.vue      |  7 +++----
 src/views/mes/pro/feedback/FeedbackForm.vue       |  4 ++--
 src/views/mes/pro/feedback/index.vue              |  4 ++--
 .../mes/wm/stocktaking/task/StockTakingForm.vue   |  4 ++--
 50 files changed, 104 insertions(+), 126 deletions(-)

diff --git a/src/components/FormCreate/src/components/useApiSelect.tsx b/src/components/FormCreate/src/components/useApiSelect.tsx
index 847eb077c..98466c32b 100644
--- a/src/components/FormCreate/src/components/useApiSelect.tsx
+++ b/src/components/FormCreate/src/components/useApiSelect.tsx
@@ -2,7 +2,7 @@ import request from '@/config/axios'
 import { isEmpty } from '@/utils/is'
 import { ApiSelectProps } from '@/components/FormCreate/src/type'
 import { jsonParse } from '@/utils'
-import { useUserStoreWithOut } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 
 export const useApiSelect = (option: ApiSelectProps) => {
   return defineComponent({
@@ -99,9 +99,7 @@ export const useApiSelect = (option: ApiSelectProps) => {
         }
 
         // 获取当前用户 ID
-        const userStore = useUserStoreWithOut()
-        const user = userStore.getUser
-        const currentUserId = user?.id
+        const currentUserId = getCurrentUserId()
         if (currentUserId) {
           // 根据多选/单选模式设置默认值
           const defaultValue = props.multiple ? [currentUserId] : currentUserId
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index ad67440d4..3f76a10b0 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -37,6 +37,12 @@ export const formatToken = (token: string): string => {
 }
 // ========== 账号相关 ==========
 
+/** 获取当前登录用户编号 */
+export const getCurrentUserId = (): number => {
+  const user = wsCache.get(CACHE_KEY.USER)?.user
+  return Number(user?.id) || 0
+}
+
 export type LoginFormType = {
   tenantName: string
   username: string
diff --git a/src/views/bpm/model/CategoryDraggableModel.vue b/src/views/bpm/model/CategoryDraggableModel.vue
index 003e46f3c..c2c679310 100644
--- a/src/views/bpm/model/CategoryDraggableModel.vue
+++ b/src/views/bpm/model/CategoryDraggableModel.vue
@@ -284,7 +284,7 @@ import * as FormApi from '@/api/bpm/form'
 import { setConfAndFields2 } from '@/utils/formCreate'
 import { BpmModelFormType } from '@/utils/constants'
 import { checkPermi } from '@/utils/permission'
-import { useUserStoreWithOut } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { useAppStore } from '@/store/modules/app'
 import { cloneDeep, isEqual } from 'lodash-es'
 import { useDebounceFn } from '@vueuse/core'
@@ -333,7 +333,6 @@ const emit = defineEmits(['success'])
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 const { push } = useRouter() // 路由
-const userStore = useUserStoreWithOut() // 用户信息缓存
 const isDark = computed(() => useAppStore().getIsDark) // 是否黑暗模式
 const router = useRouter() // 路由
 
@@ -501,7 +500,7 @@ const handleFormDetail = async (row: any) => {
 
 /** 判断是否可以操作 */
 const isManagerUser = (row: any) => {
-  const userId = userStore.getUser.id
+  const userId = getCurrentUserId()
   return row.managerUserIds && row.managerUserIds.includes(userId)
 }
 
diff --git a/src/views/bpm/model/form/index.vue b/src/views/bpm/model/form/index.vue
index 9974f0829..2d7e84987 100644
--- a/src/views/bpm/model/form/index.vue
+++ b/src/views/bpm/model/form/index.vue
@@ -88,7 +88,7 @@
 import { useRoute, useRouter } from 'vue-router'
 import { useMessage } from '@/hooks/web/useMessage'
 import { useTagsViewStore } from '@/store/modules/tagsView'
-import { useUserStoreWithOut } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 import * as ModelApi from '@/api/bpm/model'
 import * as FormApi from '@/api/bpm/form'
 import { CategoryApi, CategoryVO } from '@/api/bpm/category'
@@ -107,7 +107,6 @@ const { delView } = useTagsViewStore() // 视图操作
 const tagsView = useTagsView()
 const route = useRoute()
 const message = useMessage()
-const userStore = useUserStoreWithOut()
 
 // 组件引用
 const basicInfoRef = ref()
@@ -237,7 +236,7 @@ const initData = async () => {
   } else {
     // 情况三：新增场景
     formData.value.startUserType = 0 // 全体
-    formData.value.managerUserIds.push(userStore.getUser.id)
+    formData.value.managerUserIds.push(getCurrentUserId())
   }
 
   // 获取表单列表
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
index 53b10bdfc..85e0d3bad 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
@@ -513,7 +513,7 @@
   <SignDialog ref="signRef" @success="handleSignFinish" />
 </template>
 <script lang="ts" setup>
-import { useUserStoreWithOut } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { setConfAndFields2 } from '@/utils/formCreate'
 import * as TaskApi from '@/api/bpm/task'
 import * as ProcessInstanceApi from '@/api/bpm/processInstance'
@@ -535,7 +535,7 @@ defineOptions({ name: 'ProcessInstanceBtnContainer' })
 const router = useRouter() // 路由
 const message = useMessage() // 消息弹窗
 
-const userId = useUserStoreWithOut().getUser.id // 当前登录的编号
+const userId = getCurrentUserId() // 当前登录的编号
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 
 const props = defineProps<{
diff --git a/src/views/crm/business/BusinessForm.vue b/src/views/crm/business/BusinessForm.vue
index 4af1abe0c..cf4557a10 100644
--- a/src/views/crm/business/BusinessForm.vue
+++ b/src/views/crm/business/BusinessForm.vue
@@ -140,7 +140,7 @@ import * as BusinessApi from '@/api/crm/business'
 import * as BusinessStatusApi from '@/api/crm/business/status'
 import * as CustomerApi from '@/api/crm/customer'
 import * as UserApi from '@/api/system/user'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 import BusinessProductForm from './components/BusinessProductForm.vue'
 import { erpPriceMultiply, erpPriceInputFormatter } from '@/utils'
 
@@ -233,7 +233,7 @@ const open = async (type: string, id?: number, customerId?: number, contactId?:
   userOptions.value = await UserApi.getSimpleUserList()
   // 默认新建时选中自己
   if (formType.value === 'create') {
-    formData.value.ownerUserId = useUserStore().getUser.id
+    formData.value.ownerUserId = getCurrentUserId()
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
diff --git a/src/views/crm/clue/ClueForm.vue b/src/views/crm/clue/ClueForm.vue
index 3562c1cb9..1dddd4044 100644
--- a/src/views/crm/clue/ClueForm.vue
+++ b/src/views/crm/clue/ClueForm.vue
@@ -150,7 +150,7 @@ import * as ClueApi from '@/api/crm/clue'
 import * as AreaApi from '@/api/system/area'
 import { defaultProps } from '@/utils/tree'
 import * as UserApi from '@/api/system/user'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -205,7 +205,7 @@ const open = async (type: string, id?: number) => {
   userOptions.value = await UserApi.getSimpleUserList()
   // 默认新建时选中自己
   if (formType.value === 'create') {
-    formData.value.ownerUserId = useUserStore().getUser.id
+    formData.value.ownerUserId = getCurrentUserId()
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
diff --git a/src/views/crm/contact/ContactForm.vue b/src/views/crm/contact/ContactForm.vue
index 81813e6a2..0c90b06c3 100644
--- a/src/views/crm/contact/ContactForm.vue
+++ b/src/views/crm/contact/ContactForm.vue
@@ -177,7 +177,7 @@ import * as UserApi from '@/api/system/user'
 import * as CustomerApi from '@/api/crm/customer'
 import * as AreaApi from '@/api/system/area'
 import { defaultProps } from '@/utils/tree'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -252,7 +252,7 @@ const open = async (type: string, id?: number, customerId?: number, businessId?:
   userOptions.value = await UserApi.getSimpleUserList()
   // 默认新建时选中自己
   if (formType.value === 'create') {
-    formData.value.ownerUserId = useUserStore().getUser.id
+    formData.value.ownerUserId = getCurrentUserId()
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
diff --git a/src/views/crm/contract/ContractForm.vue b/src/views/crm/contract/ContractForm.vue
index db2eec9bf..0b43fb8ae 100644
--- a/src/views/crm/contract/ContractForm.vue
+++ b/src/views/crm/contract/ContractForm.vue
@@ -200,7 +200,7 @@ import * as UserApi from '@/api/system/user'
 import * as ContactApi from '@/api/crm/contact'
 import * as BusinessApi from '@/api/crm/business'
 import { erpPriceMultiply, erpPriceInputFormatter } from '@/utils'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 import ContractProductForm from '@/views/crm/contract/components/ContractProductForm.vue'
 
 const { t } = useI18n() // 国际化
@@ -284,7 +284,7 @@ const open = async (type: string, id?: number) => {
   userOptions.value = await UserApi.getSimpleUserList()
   // 默认新建时选中自己
   if (formType.value === 'create') {
-    formData.value.ownerUserId = useUserStore().getUser.id
+    formData.value.ownerUserId = getCurrentUserId()
   }
   // 获取联系人
   contactList.value = await ContactApi.getSimpleContactList()
diff --git a/src/views/crm/customer/CustomerForm.vue b/src/views/crm/customer/CustomerForm.vue
index 9a904d2e7..b8a591f28 100644
--- a/src/views/crm/customer/CustomerForm.vue
+++ b/src/views/crm/customer/CustomerForm.vue
@@ -150,7 +150,7 @@ import * as CustomerApi from '@/api/crm/customer'
 import * as AreaApi from '@/api/system/area'
 import { defaultProps } from '@/utils/tree'
 import * as UserApi from '@/api/system/user'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -205,7 +205,7 @@ const open = async (type: string, id?: number) => {
   userOptions.value = await UserApi.getSimpleUserList()
   // 默认新建时选中自己
   if (formType.value === 'create') {
-    formData.value.ownerUserId = useUserStore().getUser.id
+    formData.value.ownerUserId = getCurrentUserId()
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
diff --git a/src/views/crm/customer/CustomerImportForm.vue b/src/views/crm/customer/CustomerImportForm.vue
index d5f2f133a..d2bb7b369 100644
--- a/src/views/crm/customer/CustomerImportForm.vue
+++ b/src/views/crm/customer/CustomerImportForm.vue
@@ -54,7 +54,7 @@ import * as CustomerApi from '@/api/crm/customer'
 import download from '@/utils/download'
 import type { UploadUserFile } from 'element-plus'
 import * as UserApi from '@/api/system/user'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 
 defineOptions({ name: 'CrmCustomerImportForm' })
 
@@ -74,7 +74,7 @@ const open = async () => {
   await resetForm()
   // 获得用户列表
   userOptions.value = await UserApi.getSimpleUserList()
-  ownerUserId.value = useUserStore().getUser.id
+  ownerUserId.value = getCurrentUserId()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
diff --git a/src/views/crm/permission/components/PermissionList.vue b/src/views/crm/permission/components/PermissionList.vue
index 39c7aab35..a13f1685c 100644
--- a/src/views/crm/permission/components/PermissionList.vue
+++ b/src/views/crm/permission/components/PermissionList.vue
@@ -46,7 +46,7 @@
 import { dateFormatter } from '@/utils/formatTime'
 import { ElTable } from 'element-plus'
 import * as PermissionApi from '@/api/crm/permission'
-import { useUserStoreWithOut } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 import CrmPermissionForm from './PermissionForm.vue'
 import { DICT_TYPE } from '@/utils/dict'
 
@@ -64,7 +64,6 @@ const list = ref<PermissionApi.PermissionVO[]>([]) // 列表的数据
 const formData = ref({
   ownerUserId: 0
 })
-const userStore = useUserStoreWithOut() // 用户信息缓存
 
 /** 查询列表 */
 const getList = async () => {
@@ -75,13 +74,14 @@ const getList = async () => {
       bizId: props.bizId
     })
     list.value = data
+    const currentUserId = getCurrentUserId()
     const permission = list.value.find(
       (item) =>
-        item.userId === userStore.getUser.id &&
+        item.userId === currentUserId &&
         item.level === PermissionApi.PermissionLevelEnum.OWNER
     )
     if (permission) {
-      formData.value.ownerUserId = userStore.getUser.id
+      formData.value.ownerUserId = currentUserId
     }
   } finally {
     loading.value = false
@@ -150,7 +150,7 @@ watch(
       )
       validateOwnerUser.value = false
       validateWrite.value = false
-      const userId = userStore.getUser?.id
+      const userId = getCurrentUserId()
       list.value
         .filter((item) => item.userId === userId)
         .forEach((item) => {
@@ -176,15 +176,16 @@ const emits = defineEmits<{
 }>()
 /** 退出团队 */
 const handleQuit = async () => {
+  const currentUserId = getCurrentUserId()
   const permission = list.value.find(
     (item) =>
-      item.userId === userStore.getUser.id && item.level === PermissionApi.PermissionLevelEnum.OWNER
+      item.userId === currentUserId && item.level === PermissionApi.PermissionLevelEnum.OWNER
   )
   if (permission) {
     message.warning('负责人不能退出团队！')
     return
   }
-  const userPermission = list.value.find((item) => item.userId === userStore.getUser.id)
+  const userPermission = list.value.find((item) => item.userId === currentUserId)
   if (!userPermission) {
     return
   }
diff --git a/src/views/crm/product/ProductForm.vue b/src/views/crm/product/ProductForm.vue
index 1bc5aaca5..118cefcac 100644
--- a/src/views/crm/product/ProductForm.vue
+++ b/src/views/crm/product/ProductForm.vue
@@ -103,7 +103,7 @@ import * as ProductApi from '@/api/crm/product'
 import * as ProductCategoryApi from '@/api/crm/product/category'
 import { defaultProps, handleTree } from '@/utils/tree'
 import { getSimpleUserList, UserVO } from '@/api/system/user'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 
 defineOptions({ name: 'CrmProductForm' })
 
@@ -114,7 +114,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const userId = useUserStore().getUser.id // 当前登录的编号
+const userId = getCurrentUserId() // 当前登录的编号
 const formData = ref({
   id: undefined,
   name: undefined,
diff --git a/src/views/crm/receivable/ReceivableForm.vue b/src/views/crm/receivable/ReceivableForm.vue
index 61fac08d2..e74d4532e 100644
--- a/src/views/crm/receivable/ReceivableForm.vue
+++ b/src/views/crm/receivable/ReceivableForm.vue
@@ -150,7 +150,7 @@ import { ReceivableVO } from '@/api/crm/receivable'
 import * as UserApi from '@/api/system/user'
 import * as CustomerApi from '@/api/crm/customer'
 import * as ContractApi from '@/api/crm/contract'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 
 const { t } = useI18n() // 国际化
@@ -200,7 +200,7 @@ const open = async (
   customerList.value = await CustomerApi.getCustomerSimpleList()
   // 默认新建时选中自己
   if (formType.value === 'create') {
-    formData.value.ownerUserId = useUserStore().getUser.id
+    formData.value.ownerUserId = getCurrentUserId()
   }
   // 从回款计划创建回款
   if (receivablePlan) {
diff --git a/src/views/crm/receivable/plan/ReceivablePlanForm.vue b/src/views/crm/receivable/plan/ReceivablePlanForm.vue
index f321592a2..9d4f796e9 100644
--- a/src/views/crm/receivable/plan/ReceivablePlanForm.vue
+++ b/src/views/crm/receivable/plan/ReceivablePlanForm.vue
@@ -135,7 +135,7 @@ import * as ReceivablePlanApi from '@/api/crm/receivable/plan'
 import * as UserApi from '@/api/system/user'
 import * as CustomerApi from '@/api/crm/customer'
 import * as ContractApi from '@/api/crm/contract'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { cloneDeep } from 'lodash-es'
 
@@ -182,7 +182,7 @@ const open = async (type: string, id?: number, customerId?: number, contractId?:
   customerList.value = await CustomerApi.getCustomerSimpleList()
   // 默认新建时选中自己
   if (formType.value === 'create') {
-    formData.value.ownerUserId = useUserStore().getUser.id
+    formData.value.ownerUserId = getCurrentUserId()
   }
   // 设置 customerId 和 contractId 默认值
   if (customerId) {
diff --git a/src/views/im/home/components/friend/FriendAddDialog.vue b/src/views/im/home/components/friend/FriendAddDialog.vue
index 011a66866..d2b6d92fa 100644
--- a/src/views/im/home/components/friend/FriendAddDialog.vue
+++ b/src/views/im/home/components/friend/FriendAddDialog.vue
@@ -134,7 +134,7 @@ import { useUserStore } from '@/store/modules/user'
 
 import UserAvatar from '../user/UserAvatar.vue'
 import { useFriendStore } from '../../store/friendStore'
-import { getCurrentUserId } from '../../../utils/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { ImFriendAddSource } from '../../../utils/constants'
 import { getGenderColor, getGenderIcon } from '../../../utils/user'
 import { getSimpleUserListByNickname, type UserVO } from '@/api/system/user'
diff --git a/src/views/im/home/components/group/GroupInfo.vue b/src/views/im/home/components/group/GroupInfo.vue
index 171571f68..bb3a17508 100644
--- a/src/views/im/home/components/group/GroupInfo.vue
+++ b/src/views/im/home/components/group/GroupInfo.vue
@@ -49,7 +49,7 @@ import { computed, ref, watch } from 'vue'
 
 import GroupAvatar from './GroupAvatar.vue'
 import GroupMemberGrid from './GroupMemberGrid.vue'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { CommonStatusEnum } from '@/utils/constants'
 import { useFriendStore } from '../../store/friendStore'
 import { useGroupStore } from '../../store/groupStore'
@@ -70,7 +70,6 @@ const emit = defineEmits<{
   apply: [group: GroupLite]
 }>()
 
-const userStore = useUserStore()
 const groupStore = useGroupStore()
 const friendStore = useFriendStore()
 
@@ -91,7 +90,7 @@ const isMember = computed(() => {
     return false
   }
   if (cached.membersLoaded && cached.members) {
-    const myId = Number(userStore.getUser?.id) || 0
+    const myId = getCurrentUserId()
     return cached.members.some(
       (m) => m.userId === myId && m.status === CommonStatusEnum.ENABLE
     )
diff --git a/src/views/im/home/components/group/GroupMemberAddDialog.vue b/src/views/im/home/components/group/GroupMemberAddDialog.vue
index 04ebdd57d..b3b795def 100644
--- a/src/views/im/home/components/group/GroupMemberAddDialog.vue
+++ b/src/views/im/home/components/group/GroupMemberAddDialog.vue
@@ -37,7 +37,7 @@ import { CommonStatusEnum } from '@/utils/constants'
 import { inviteGroupMember } from '@/api/im/group/member'
 import { useFriendStore } from '../../store/friendStore'
 import { useGroupStore } from '../../store/groupStore'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { ImGroupMemberRole } from '@/views/im/utils/constants'
 import { GROUP_MAX_MEMBER } from '@/views/im/utils/config'
 import FriendPickerPanel from '../picker/FriendPickerPanel.vue'
@@ -53,7 +53,6 @@ const emit = defineEmits<{
 const message = useMessage()
 const friendStore = useFriendStore()
 const groupStore = useGroupStore()
-const userStore = useUserStore()
 
 const visible = ref(false)
 const submitting = ref(false)
@@ -99,7 +98,7 @@ const willGoApproval = computed(() => {
   if (!group?.joinApproval) {
     return false
   }
-  const myId = Number(userStore.getUser?.id) || 0
+  const myId = getCurrentUserId()
   if (!myId) {
     return false
   }
diff --git a/src/views/im/home/components/rtc/RtcCallContainer.vue b/src/views/im/home/components/rtc/RtcCallContainer.vue
index f87d366de..f07726aeb 100644
--- a/src/views/im/home/components/rtc/RtcCallContainer.vue
+++ b/src/views/im/home/components/rtc/RtcCallContainer.vue
@@ -77,7 +77,7 @@ import {
   ImConversationType
 } from '@/views/im/utils/constants'
 import { RTC_NO_ANSWER_CALL_CHECK_INTERVAL_MS } from '@/views/im/utils/config'
-import { getCurrentUserId } from '@/views/im/utils/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { getSenderAvatar, getSenderDisplayName } from '@/views/im/utils/user'
 import { Track } from 'livekit-client'
 import RtcCallInviting from './RtcCallInviting.vue'
diff --git a/src/views/im/home/components/rtc/RtcCallMemberPickerDialog.vue b/src/views/im/home/components/rtc/RtcCallMemberPickerDialog.vue
index f2f390b31..5aff35640 100644
--- a/src/views/im/home/components/rtc/RtcCallMemberPickerDialog.vue
+++ b/src/views/im/home/components/rtc/RtcCallMemberPickerDialog.vue
@@ -28,7 +28,7 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue'
 import { useGroupStore } from '../../store/groupStore'
-import { getCurrentUserId } from '@/views/im/utils/user'
+import { getCurrentUserId } from '@/utils/auth'
 import GroupMemberPickerPanel from '../picker/GroupMemberPickerPanel.vue'
 import type { GroupMemberLite } from '../group/GroupMember.vue'
 
diff --git a/src/views/im/home/components/rtc/RtcGroupCallBanner.vue b/src/views/im/home/components/rtc/RtcGroupCallBanner.vue
index 0dd917427..1a3509bbb 100644
--- a/src/views/im/home/components/rtc/RtcGroupCallBanner.vue
+++ b/src/views/im/home/components/rtc/RtcGroupCallBanner.vue
@@ -70,7 +70,7 @@ import { useRtcStore } from '../../store/rtcStore'
 import { useGroupCallMembers } from '../../composables/useGroupCallMembers'
 import { joinCall, getActiveCall } from '@/api/im/rtc'
 import { DICT_TYPE, getDictLabel } from '@/utils/dict'
-import { getCurrentUserId } from '@/views/im/utils/user'
+import { getCurrentUserId } from '@/utils/auth'
 
 const props = defineProps<{
   groupId: number
diff --git a/src/views/im/home/components/user/UserInfoCard.vue b/src/views/im/home/components/user/UserInfoCard.vue
index 4411964b4..6d62f9f9d 100644
--- a/src/views/im/home/components/user/UserInfoCard.vue
+++ b/src/views/im/home/components/user/UserInfoCard.vue
@@ -31,7 +31,7 @@
 import { computed, onMounted, onUnmounted } from 'vue'
 import { useRouter } from 'vue-router'
 
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { useImUiStore } from '../../store/uiStore'
 import { useConversationStore } from '../../store/conversationStore'
 import { useFriendStore } from '../../store/friendStore'
@@ -44,14 +44,13 @@ defineOptions({ name: 'ImUserInfoCard' })
 const uiStore = useImUiStore()
 const conversationStore = useConversationStore()
 const friendStore = useFriendStore()
-const userStore = useUserStore()
 const router = useRouter()
 
 const card = computed(() => uiStore.userInfoCard)
 const user = computed(() => card.value.user)
 
 const isSelf = computed(() => {
-  const myId = Number(userStore.getUser?.id) || 0
+  const myId = getCurrentUserId()
   return !!user.value?.id && user.value.id === myId
 })
 const isActiveFriend = computed(() => {
diff --git a/src/views/im/home/composables/useMediaUploader.ts b/src/views/im/home/composables/useMediaUploader.ts
index 9cbaddce3..2b3ab0124 100644
--- a/src/views/im/home/composables/useMediaUploader.ts
+++ b/src/views/im/home/composables/useMediaUploader.ts
@@ -1,5 +1,5 @@
 import { updateFile } from '@/api/infra/file'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { useMessage } from '@/hooks/web/useMessage'
 import { isOpenableUrl } from '@/utils/url'
 
@@ -157,7 +157,6 @@ export function ensureMediaSizeWithinLimit(
 export const useMediaUploader = () => {
   const conversationStore = useConversationStore()
   const messageStore = useMessageStore()
-  const userStore = useUserStore()
   const muteOverlay = useMuteOverlay()
   const message = useMessage()
   const { sendRaw } = useMessageSender()
@@ -193,7 +192,7 @@ export const useMediaUploader = () => {
       content: opts.buildContent(blobUrl),
       status: ImMessageStatus.SENDING,
       sendTime: Date.now(),
-      senderId: Number(userStore.getUser?.id) || 0,
+      senderId: getCurrentUserId(),
       targetId: conversation.targetId,
       selfSend: true,
       uploadProgress: 0,
diff --git a/src/views/im/home/composables/useMessagePuller.ts b/src/views/im/home/composables/useMessagePuller.ts
index b2abc107a..7850ea622 100644
--- a/src/views/im/home/composables/useMessagePuller.ts
+++ b/src/views/im/home/composables/useMessagePuller.ts
@@ -32,7 +32,7 @@ import {
 } from '../../utils/config'
 import { buildChannelConversationStub } from '../../utils/channel'
 import { generateClientMessageId, getPrivateMessagePeerId } from '../../utils/message'
-import { getCurrentUserId } from '../../utils/user'
+import { getCurrentUserId } from '@/utils/auth'
 import type { Message } from '../types'
 
 /**
diff --git a/src/views/im/home/composables/useMessageSender.ts b/src/views/im/home/composables/useMessageSender.ts
index 86f07f13c..ff030b0a4 100644
--- a/src/views/im/home/composables/useMessageSender.ts
+++ b/src/views/im/home/composables/useMessageSender.ts
@@ -23,7 +23,7 @@ import { ImMessageType, ImMessageStatus, ImConversationType } from '../../utils/
 import { MESSAGE_PRIVATE_READ_ENABLED, MESSAGE_GROUP_READ_ENABLED } from '../../utils/config'
 import { getClientConversationId } from '../../utils/db'
 import type { Conversation, Message } from '../types'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 
 /** 非文本消息的扩展选项（通用） */
 interface SendExtOptions {
@@ -60,7 +60,6 @@ interface SendExtOptions {
 export const useMessageSender = () => {
   const conversationStore = useConversationStore()
   const messageStore = useMessageStore()
-  const userStore = useUserStore()
 
   /** 构造本地乐观消息对象 */
   const buildLocalMessage = (opts: {
@@ -76,7 +75,7 @@ export const useMessageSender = () => {
       content: opts.content,
       status: ImMessageStatus.SENDING,
       sendTime: Date.now(),
-      senderId: Number(userStore.getUser?.id) || 0,
+      senderId: getCurrentUserId(),
       targetId: opts.targetId,
       selfSend: true,
       atUserIds: opts.atUserIds
diff --git a/src/views/im/home/composables/useMuteOverlay.ts b/src/views/im/home/composables/useMuteOverlay.ts
index 764feab30..20e38f424 100644
--- a/src/views/im/home/composables/useMuteOverlay.ts
+++ b/src/views/im/home/composables/useMuteOverlay.ts
@@ -1,6 +1,6 @@
 import { computed, onScopeDispose, ref, type ComputedRef } from 'vue'
 
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { useConversationStore } from '../store/conversationStore'
 import { useGroupStore } from '../store/groupStore'
 import { ImConversationType, ImGroupMemberRole } from '../../utils/constants'
@@ -47,7 +47,6 @@ function unsubscribeNowTick(): void {
 export function useMuteOverlay(): ComputedRef<MuteOverlayInfo | null> {
   const conversationStore = useConversationStore()
   const groupStore = useGroupStore()
-  const userStore = useUserStore()
 
   // 订阅模块级 tick；scope 销毁时反订阅，最后一个订阅者退场后 timer 也跟着清
   subscribeNowTick()
@@ -62,7 +61,7 @@ export function useMuteOverlay(): ComputedRef<MuteOverlayInfo | null> {
     if (!group) {
       return null
     }
-    const myId = Number(userStore.getUser?.id) || 0
+    const myId = getCurrentUserId()
     // 群封禁：管理后台操作，所有人不可发送
     if (group.banned) {
       return { text: '该群已被管理员封禁，无法发送消息', icon: 'ant-design:stop-outlined' }
diff --git a/src/views/im/home/pages/contact/FriendRequestDetail.vue b/src/views/im/home/pages/contact/FriendRequestDetail.vue
index 18b887792..6430061a7 100644
--- a/src/views/im/home/pages/contact/FriendRequestDetail.vue
+++ b/src/views/im/home/pages/contact/FriendRequestDetail.vue
@@ -88,7 +88,7 @@ import { ElMessageBox } from 'element-plus'
 import UserAvatar from '../../components/user/UserAvatar.vue'
 import UserInfo from '../../components/user/UserInfo.vue'
 import { useFriendStore } from '../../store/friendStore'
-import { getCurrentUserId } from '../../../utils/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { ImFriendRequestHandleResult } from '../../../utils/constants'
 import { DICT_TYPE, getDictLabel } from '@/utils/dict'
 import type { FriendRequest, User } from '../../types'
diff --git a/src/views/im/home/pages/contact/FriendRequestList.vue b/src/views/im/home/pages/contact/FriendRequestList.vue
index 4beb9b37f..42a7dd6fe 100644
--- a/src/views/im/home/pages/contact/FriendRequestList.vue
+++ b/src/views/im/home/pages/contact/FriendRequestList.vue
@@ -79,7 +79,7 @@ import { computed, ref } from 'vue'
 import Icon from '@/components/Icon/src/Icon.vue'
 import UserAvatar from '../../components/user/UserAvatar.vue'
 import { useFriendStore } from '../../store/friendStore'
-import { getCurrentUserId } from '../../../utils/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { DICT_TYPE, getDictLabel } from '@/utils/dict'
 import type { FriendRequest } from '../../types'
 
diff --git a/src/views/im/home/pages/conversation/components/conversation/ConversationGroupSide.vue b/src/views/im/home/pages/conversation/components/conversation/ConversationGroupSide.vue
index 279e83cec..5b9fc6d5a 100644
--- a/src/views/im/home/pages/conversation/components/conversation/ConversationGroupSide.vue
+++ b/src/views/im/home/pages/conversation/components/conversation/ConversationGroupSide.vue
@@ -391,7 +391,7 @@ import { computed, ref, watch } from 'vue'
 import Icon from '@/components/Icon/src/Icon.vue'
 import { useMessage } from '@/hooks/web/useMessage'
 
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { CommonStatusEnum } from '@/utils/constants'
 import {
   updateGroup,
@@ -436,7 +436,6 @@ const emit = defineEmits<{
   'open-history': [] // 点击 "查找聊天内容" 行 → 父组件打开 MessageHistory 弹窗
 }>()
 
-const userStore = useUserStore()
 const conversationStore = useConversationStore()
 const groupStore = useGroupStore()
 const message = useMessage()
@@ -461,7 +460,7 @@ function handleOpenInvite() {
   inviteDialogRef.value?.open({ groupId: props.group.id })
 }
 
-const myId = computed(() => Number(userStore.getUser?.id) || 0)
+const myId = computed(() => getCurrentUserId())
 const isOwner = computed(() => props.group != null && props.group.ownerId === myId.value)
 /** 当前用户在群里的角色（来自 props.members 的 me 行）；用于判定是否可移出他人 */
 const myRole = computed(() => props.members.find((m) => m.userId === myId.value)?.role)
diff --git a/src/views/im/home/pages/conversation/components/input/MentionPicker.vue b/src/views/im/home/pages/conversation/components/input/MentionPicker.vue
index af7256b5a..b0e0e8dd0 100644
--- a/src/views/im/home/pages/conversation/components/input/MentionPicker.vue
+++ b/src/views/im/home/pages/conversation/components/input/MentionPicker.vue
@@ -65,7 +65,7 @@ import { computed, ref, useTemplateRef, watch } from 'vue'
 import { ElScrollbar } from 'element-plus'
 
 import Icon from '@/components/Icon/src/Icon.vue'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { CommonStatusEnum } from '@/utils/constants'
 import { IM_AT_ALL_NICKNAME, IM_AT_ALL_USER_ID } from '@/views/im/utils/constants'
 import GroupMember, { type GroupMemberLite } from '../../../../components/group/GroupMember.vue'
@@ -92,12 +92,11 @@ const emit = defineEmits<{
   select: [member: GroupMemberLite]
 }>()
 
-const userStore = useUserStore()
 const scrollRef = useTemplateRef<InstanceType<typeof ElScrollbar>>('scrollRef')
 const activeIdx = ref(0)
 
 /** 当前登录用户 id（成员列表过滤掉自己） */
-const selfUserId = computed(() => Number(userStore.getUser?.id) || 0)
+const selfUserId = computed(() => getCurrentUserId())
 
 /**
  * 虚拟"所有人"项：群主 / 管理员（canAtAll=true）+ 关键字命中"所有人"前缀时存在
diff --git a/src/views/im/home/pages/conversation/components/input/MessageInput.vue b/src/views/im/home/pages/conversation/components/input/MessageInput.vue
index 00e4ff6cc..25c6ae80c 100644
--- a/src/views/im/home/pages/conversation/components/input/MessageInput.vue
+++ b/src/views/im/home/pages/conversation/components/input/MessageInput.vue
@@ -169,7 +169,7 @@ import { useGroupStore } from '@/views/im/home/store/groupStore'
 import { useFriendStore } from '@/views/im/home/store/friendStore'
 import { getMemberDisplayName } from '@/views/im/utils/user'
 import { useMessage } from '@/hooks/web/useMessage'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { useMessageSender } from '@/views/im/home/composables/useMessageSender'
 import {
   ensureMediaSizeWithinLimit,
@@ -199,7 +199,6 @@ defineOptions({ name: 'ImMessageInput' })
 const conversationStore = useConversationStore()
 const groupStore = useGroupStore()
 const friendStore = useFriendStore()
-const userStore = useUserStore()
 const message = useMessage()
 const { send, sendRaw } = useMessageSender()
 const {
@@ -654,7 +653,7 @@ const canAtAll = computed<boolean>(() => {
   if (!group) {
     return false
   }
-  const myId = Number(userStore.getUser?.id) || 0
+  const myId = getCurrentUserId()
   if (!myId) {
     return false
   }
diff --git a/src/views/im/home/pages/conversation/components/message/GroupPinnedMessage.vue b/src/views/im/home/pages/conversation/components/message/GroupPinnedMessage.vue
index 02055de93..030905b7c 100644
--- a/src/views/im/home/pages/conversation/components/message/GroupPinnedMessage.vue
+++ b/src/views/im/home/pages/conversation/components/message/GroupPinnedMessage.vue
@@ -81,7 +81,7 @@ import { ImConversationType, ImGroupMemberRole } from '@/views/im/utils/constant
 import { unpinGroupMessage as apiUnpinGroupMessage } from '@/api/im/group'
 import { getSenderDisplayName } from '@/views/im/utils/user'
 import { resolveConversationLastContent } from '@/views/im/utils/conversation'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { useGroupStore } from '../../../../store/groupStore'
 import type { Message } from '../../../../types'
 
@@ -97,7 +97,6 @@ const emit = defineEmits<{
   locate: [messageId: number]
 }>()
 
-const userStore = useUserStore()
 const groupStore = useGroupStore()
 const message = useMessage()
 
@@ -124,7 +123,7 @@ const latest = computed(() => pinnedMessages.value[pinnedMessages.value.length -
 
 /** 当前用户是否群主 / 管理员（决定是否显示「移除」入口） */
 const canManage = computed(() => {
-  const myId = Number(userStore.getUser?.id) || 0
+  const myId = getCurrentUserId()
   const role = group.value?.members?.find((m) => m.userId === myId)?.role
   return role === ImGroupMemberRole.OWNER || role === ImGroupMemberRole.ADMIN
 })
diff --git a/src/views/im/home/pages/conversation/components/message/GroupRequestPending.vue b/src/views/im/home/pages/conversation/components/message/GroupRequestPending.vue
index 0fd45024e..daeae4d32 100644
--- a/src/views/im/home/pages/conversation/components/message/GroupRequestPending.vue
+++ b/src/views/im/home/pages/conversation/components/message/GroupRequestPending.vue
@@ -34,7 +34,7 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue'
 import Icon from '@/components/Icon/src/Icon.vue'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 
 import { ImGroupMemberRole } from '@/views/im/utils/constants'
 import { useGroupStore } from '../../../../store/groupStore'
@@ -47,7 +47,6 @@ const props = defineProps<{
   groupId: number
 }>()
 
-const userStore = useUserStore()
 const groupStore = useGroupStore()
 const groupRequestStore = useGroupRequestStore()
 
@@ -64,7 +63,7 @@ const group = computed(() => groupStore.getGroup(props.groupId))
 
 /** 当前用户在群里的角色；优先用 group.members，懒加载未到时回退到 ownerUserId 直判 */
 const myRole = computed(() => {
-  const myId = Number(userStore.getUser?.id) || 0
+  const myId = getCurrentUserId()
   if (group.value?.ownerUserId === myId) {
     return ImGroupMemberRole.OWNER
   }
diff --git a/src/views/im/home/pages/conversation/components/message/MessageItem.vue b/src/views/im/home/pages/conversation/components/message/MessageItem.vue
index 89f0baa27..833fea500 100644
--- a/src/views/im/home/pages/conversation/components/message/MessageItem.vue
+++ b/src/views/im/home/pages/conversation/components/message/MessageItem.vue
@@ -38,7 +38,7 @@
       :class="{ 'flex-row-reverse': message.selfSend }"
     >
       <UserAvatar
-        :id="message.selfSend ? userStore.getUser?.id : message.senderId"
+        :id="message.selfSend ? getCurrentUserId() : message.senderId"
         :name="senderRealNickname"
         :url="message.selfSend ? userStore.getUser?.avatar : senderAvatar"
         :size="36"
@@ -95,7 +95,7 @@
       <!-- 头像：点击弹 UserInfoCard 由 UserAvatar 内部承接；频道素材消息不显示头像 -->
       <UserAvatar
         v-if="!isMaterial"
-        :id="message.selfSend ? userStore.getUser?.id : message.senderId"
+        :id="message.selfSend ? getCurrentUserId() : message.senderId"
         :name="senderRealNickname"
         :url="message.selfSend ? userStore.getUser?.avatar : senderAvatar"
         :size="36"
@@ -232,6 +232,7 @@ import {
 import { buildRecallTipSegments } from '@/views/im/utils/conversation'
 import { formatTimeTip } from '@/views/im/utils/time'
 import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { useConversationStore } from '../../../../store/conversationStore'
 import { useGroupStore } from '../../../../store/groupStore'
 import { useFriendStore } from '../../../../store/friendStore'
@@ -573,7 +574,7 @@ const groupMembersForReadStatus = computed<GroupMemberLite[]>(() => {
 
 /** 是否 @我（群消息展示小徽标） */
 const isAtMe = computed(() => {
-  const myId = Number(userStore.getUser?.id) || 0
+  const myId = getCurrentUserId()
   if (!myId) {
     return false
   }
@@ -804,7 +805,7 @@ const currentGroup = computed(() => {
 
 /** 当前用户在该群里的角色；私聊或非群成员 → undefined */
 const myGroupRole = computed(() => {
-  const myId = Number(userStore.getUser?.id) || 0
+  const myId = getCurrentUserId()
   return currentGroup.value?.members?.find((m) => m.userId === myId)?.role
 })
 
diff --git a/src/views/im/home/store/channelStore.ts b/src/views/im/home/store/channelStore.ts
index e7fb925a9..9b43334a5 100644
--- a/src/views/im/home/store/channelStore.ts
+++ b/src/views/im/home/store/channelStore.ts
@@ -72,7 +72,7 @@ export const useChannelStore = defineStore('imChannelStore', {
       }
     },
 
-    /** 用最新的频道信息覆盖已有 CHANNEL 会话的 name / avatar；conversationStore 持久化的旧占位被刷掉 */
+    /** 用最新的频道信息覆盖已有 CHANNEL 会话的 name / avatar */
     syncChannelConversationMetadata() {
       const conversationStore = useConversationStore()
       const indexed = new Map(this.channels.map((c) => [c.id, c]))
@@ -84,12 +84,10 @@ export const useChannelStore = defineStore('imChannelStore', {
         if (!channel) {
           return
         }
-        if (channel.name) {
-          conversation.name = channel.name
-        }
-        if (channel.avatar) {
-          conversation.avatar = channel.avatar
-        }
+        conversationStore.updateConversation(ImConversationType.CHANNEL, conversation.targetId, {
+          name: channel.name,
+          avatar: channel.avatar
+        })
       })
     },
 
diff --git a/src/views/im/home/store/conversationStore.ts b/src/views/im/home/store/conversationStore.ts
index 943c3db24..a847455fe 100644
--- a/src/views/im/home/store/conversationStore.ts
+++ b/src/views/im/home/store/conversationStore.ts
@@ -5,7 +5,7 @@ import { store } from '@/store'
 import { CONVERSATION_RECENT_FORWARD_MAX } from '../../utils/config'
 import { ImConversationType } from '../../utils/constants'
 import { getClientConversationId, getDb, StorageKeys, type DbTransaction } from '../../utils/db'
-import { getCurrentUserId } from '../../utils/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { useMessageStore } from './messageStore'
 import type { Conversation, ConversationDO } from '../types'
 
diff --git a/src/views/im/home/store/friendStore.ts b/src/views/im/home/store/friendStore.ts
index eac86581d..6983328e1 100644
--- a/src/views/im/home/store/friendStore.ts
+++ b/src/views/im/home/store/friendStore.ts
@@ -24,7 +24,7 @@ import { useConversationStore } from './conversationStore'
 import { ImConversationType, ImFriendRequestHandleResult } from '../../utils/constants'
 import { FRIEND_REQUEST_PAGE_SIZE } from '../../utils/config'
 import { getDb } from '../../utils/db'
-import { getCurrentUserId } from '../../utils/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { getFriendDisplayName } from '../../utils/user'
 import type { Friend, FriendDO, FriendLite, FriendRequest, FriendRequestDO } from '../types'
 
diff --git a/src/views/im/home/store/groupStore.ts b/src/views/im/home/store/groupStore.ts
index 2546c183f..82dfa780c 100644
--- a/src/views/im/home/store/groupStore.ts
+++ b/src/views/im/home/store/groupStore.ts
@@ -22,7 +22,7 @@ import {
 } from '../../utils/constants'
 import { CommonStatusEnum } from '@/utils/constants'
 import { getDb } from '../../utils/db'
-import { getCurrentUserId } from '../../utils/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { getGroupDisplayName } from '../../utils/user'
 import { type GroupNotificationPayload } from '../../utils/message'
 import type { Group, GroupDO, GroupMember, GroupMemberDO, Message } from '../types'
diff --git a/src/views/im/home/store/messageStore.ts b/src/views/im/home/store/messageStore.ts
index 86ed01b0a..057c9ef39 100644
--- a/src/views/im/home/store/messageStore.ts
+++ b/src/views/im/home/store/messageStore.ts
@@ -25,7 +25,7 @@ import {
   revokeBlobUrlsInContent
 } from '../../utils/message'
 import { resolveConversationLastContent } from '../../utils/conversation'
-import { getCurrentUserId } from '../../utils/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { tryGetSenderDisplayName } from '../../utils/user'
 import { useGroupStore } from './groupStore'
 import { useConversationStore } from './conversationStore'
diff --git a/src/views/im/home/store/rtcStore.ts b/src/views/im/home/store/rtcStore.ts
index 89b7227a0..d8fc926d1 100644
--- a/src/views/im/home/store/rtcStore.ts
+++ b/src/views/im/home/store/rtcStore.ts
@@ -10,7 +10,7 @@ import {
   type ImRtcParticipantStatusValue,
   type ImRtcCallStageValue
 } from '../../utils/constants'
-import { getCurrentUserId } from '../../utils/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { useFriendStore } from './friendStore'
 import { useGroupStore } from './groupStore'
 
diff --git a/src/views/im/home/store/websocketStore.ts b/src/views/im/home/store/websocketStore.ts
index 104da4707..272dcfb21 100644
--- a/src/views/im/home/store/websocketStore.ts
+++ b/src/views/im/home/store/websocketStore.ts
@@ -1,7 +1,6 @@
 import { defineStore, acceptHMRUpdate } from 'pinia'
 import { store } from '@/store'
-import { getRefreshToken } from '@/utils/auth'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId, getRefreshToken } from '@/utils/auth'
 
 import {
   ImWebSocketMessageType,
@@ -476,9 +475,8 @@ export const useImWebSocketStore = defineStore('imWebSocketStore', {
      */
     handlePrivateMessage(websocketMessage: ImPrivateMessageDTO) {
       const conversationStore = useConversationStore()
-      const userStore = useUserStore()
       const friendStore = useFriendStore()
-      const currentUserId = Number(userStore.getUser?.id) || 0
+      const currentUserId = getCurrentUserId()
 
       // 0. 防御层：senderId / receiverId 均不含当前用户的私聊帧直接丢弃，避免后端路由 / 多端串号污染会话
       //    （FRIEND_* 等系统通知也走这条通道，但 fromUserId=senderId、toUserId=receiverId 仍是当前用户视角）
@@ -603,9 +601,8 @@ export const useImWebSocketStore = defineStore('imWebSocketStore', {
      */
     handleGroupMessage(websocketMessage: ImGroupMessageDTO) {
       const conversationStore = useConversationStore()
-      const userStore = useUserStore()
       const groupStore = useGroupStore()
-      const currentUserId = Number(userStore.getUser?.id) || 0
+      const currentUserId = getCurrentUserId()
       const selfSend = websocketMessage.senderId === currentUserId
 
       // 0. 防御层：定向群消息 receiverUserIds 非空且未包含当前用户时丢弃
@@ -723,8 +720,7 @@ export const useImWebSocketStore = defineStore('imWebSocketStore', {
      *    becomeFriends 单条入库后双方收到同一份 payload，payload.friendUserId 固定是 toUserId，本端真正的对端要从帧 sender / receiver 反推
      */
     computeFriendPeerId(frame: ImPrivateMessageDTO): number {
-      const userStore = useUserStore()
-      const currentUserId = Number(userStore.getUser?.id) || 0
+      const currentUserId = getCurrentUserId()
       return getPrivateMessagePeerId(frame, currentUserId)
     },
 
diff --git a/src/views/im/utils/db.ts b/src/views/im/utils/db.ts
index 2ede7ec5f..a29195291 100644
--- a/src/views/im/utils/db.ts
+++ b/src/views/im/utils/db.ts
@@ -1,6 +1,6 @@
 import { toRaw } from 'vue'
 
-import { getCurrentUserId } from './user'
+import { getCurrentUserId } from '@/utils/auth'
 import { ImConversationType } from './constants'
 import type { MessageDO, SettingDO } from '../home/types'
 
diff --git a/src/views/im/utils/message.ts b/src/views/im/utils/message.ts
index e8ce1ae2d..42c0527fe 100644
--- a/src/views/im/utils/message.ts
+++ b/src/views/im/utils/message.ts
@@ -6,7 +6,7 @@ import {
   ImMessageType,
   type ImConversationTypeValue
 } from './constants'
-import { getCurrentUserId } from './user'
+import { getCurrentUserId } from '@/utils/auth'
 import { formatCallDuration } from './time'
 import { useFriendStore } from '../home/store/friendStore'
 import { useGroupStore } from '../home/store/groupStore'
diff --git a/src/views/im/utils/user.ts b/src/views/im/utils/user.ts
index b66f2aafb..06b71fae1 100644
--- a/src/views/im/utils/user.ts
+++ b/src/views/im/utils/user.ts
@@ -11,7 +11,6 @@
 
 import { countBy } from 'lodash-es'
 
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { useUserStore } from '@/store/modules/user'
 import { SystemUserSexEnum } from '@/utils/constants'
 import {
@@ -20,6 +19,7 @@ import {
   IM_AT_ALL_NICKNAME,
   IM_AT_ALL_USER_ID
 } from './constants'
+import { getCurrentUserId } from '@/utils/auth'
 import { type MentionCandidate } from './message'
 import { useConversationStore } from '../home/store/conversationStore'
 import { useFriendStore } from '../home/store/friendStore'
@@ -31,13 +31,6 @@ import type { Conversation, Friend, Group, User } from '../home/types'
 // MessageBubble 的 textSegments 才不会跟着无谓重算
 const EMPTY_MENTIONS: MentionCandidate[] = []
 
-/** 取当前登录用户编号 */
-export function getCurrentUserId(): number {
-  const { wsCache } = useCache()
-  const user = wsCache.get(CACHE_KEY.USER)?.user
-  return Number(user?.id) || 0
-}
-
 /**
  * 私聊好友显示名：备注 > 真实昵称
  *
diff --git a/src/views/mall/trade/delivery/pickUpOrder/index.vue b/src/views/mall/trade/delivery/pickUpOrder/index.vue
index 5d4fc4f42..ed98c0f31 100644
--- a/src/views/mall/trade/delivery/pickUpOrder/index.vue
+++ b/src/views/mall/trade/delivery/pickUpOrder/index.vue
@@ -228,7 +228,7 @@ import { TradeOrderSummaryRespVO } from '@/api/mall/trade/order'
 import { DeliveryPickUpStoreVO } from '@/api/mall/trade/delivery/pickUpStore'
 import OrderPickUpForm from '@/views/mall/trade/order/form/OrderPickUpForm.vue'
 import { ref, onMounted } from 'vue'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 const message = useMessage() // 消息弹窗
 
 const port = ref('')
@@ -319,7 +319,7 @@ const pickUpStoreList = ref<DeliveryPickUpStoreVO[]>([])
 const getPickUpStoreList = async () => {
   pickUpStoreList.value = await PickUpStoreApi.getSimpleDeliveryPickUpStoreList()
   // 移除自己无法核销的门店
-  const userId = useUserStore().getUser.id
+  const userId = getCurrentUserId()
   pickUpStoreList.value = pickUpStoreList.value.filter((item) =>
     item.verifyUserIds?.includes(userId)
   )
diff --git a/src/views/mes/dv/maintenrecord/MaintenRecordForm.vue b/src/views/mes/dv/maintenrecord/MaintenRecordForm.vue
index 26b6db417..81fc1e2d0 100644
--- a/src/views/mes/dv/maintenrecord/MaintenRecordForm.vue
+++ b/src/views/mes/dv/maintenrecord/MaintenRecordForm.vue
@@ -76,7 +76,7 @@ import DvMachinerySelect from '@/views/mes/dv/machinery/components/DvMachinerySe
 import DvCheckPlanSelect from '@/views/mes/dv/checkplan/components/DvCheckPlanSelect.vue'
 import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
 import MaintenRecordLineList from './MaintenRecordLineList.vue'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 import {
   MesDvMaintenRecordStatusEnum,
   MesDvSubjectTypeEnum,
@@ -88,7 +88,6 @@ const emit = defineEmits(['success'])
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-const userStore = useUserStore()
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单的加载中
@@ -135,7 +134,7 @@ const open = async (type: string, id?: number) => {
   }
   // 新增时，自动填充当前登录用户
   if (type === 'create') {
-    formData.value.userId = userStore.getUser.id
+    formData.value.userId = getCurrentUserId()
   }
   // 保存原始数据快照
   originalFormData.value = JSON.stringify(formData.value)
diff --git a/src/views/mes/pro/andon/record/AndonRecordForm.vue b/src/views/mes/pro/andon/record/AndonRecordForm.vue
index 8b0cfa57e..6945690e0 100644
--- a/src/views/mes/pro/andon/record/AndonRecordForm.vue
+++ b/src/views/mes/pro/andon/record/AndonRecordForm.vue
@@ -118,7 +118,7 @@
 import { ProAndonRecordApi } from '@/api/mes/pro/andon/record'
 import { ProAndonConfigVO } from '@/api/mes/pro/andon/config'
 import { DICT_TYPE } from '@/utils/dict'
-import { useUserStoreWithOut } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 import { formatDate } from '@/utils/formatTime'
 import { MesProAndonStatusEnum, MesProWorkOrderStatusEnum } from '@/views/mes/utils/constants'
 import MdWorkstationSelect from '@/views/mes/md/workstation/components/MdWorkstationSelect.vue'
@@ -148,7 +148,6 @@ const createRules = reactive({
   workstationId: [{ required: true, message: '工作站不能为空', trigger: 'change' }],
   configId: [{ required: true, message: '呼叫原因不能为空', trigger: 'change' }]
 })
-const userStore = useUserStoreWithOut()
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
@@ -157,7 +156,7 @@ const open = async (type: string, id?: number) => {
   resetForm()
   if (type === 'create') {
     // 新增时，自动填充当前用户
-    formData.value.userId = userStore.getUser?.id
+    formData.value.userId = getCurrentUserId()
   } else {
     // 修改 / 详情时，设置数据
     formLoading.value = true
@@ -169,7 +168,7 @@ const open = async (type: string, id?: number) => {
           formData.value.handleTime = formatDate(new Date())
         }
         if (!formData.value.handlerUserId) {
-          formData.value.handlerUserId = userStore.getUser?.id
+          formData.value.handlerUserId = getCurrentUserId()
         }
       }
     } finally {
diff --git a/src/views/mes/pro/feedback/FeedbackForm.vue b/src/views/mes/pro/feedback/FeedbackForm.vue
index 33273dc35..fe7b3ba3c 100644
--- a/src/views/mes/pro/feedback/FeedbackForm.vue
+++ b/src/views/mes/pro/feedback/FeedbackForm.vue
@@ -298,7 +298,7 @@ import MdWorkstationSelect from '@/views/mes/md/workstation/components/MdWorksta
 import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
 import ItemConsumeList from './ItemConsumeList.vue'
 import ProductProduceList from './ProductProduceList.vue'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 import {
   MesAutoCodeRuleCode,
   MesProFeedbackStatusEnum,
@@ -484,7 +484,7 @@ const open = async (type: string, id?: number) => {
     }
   } else {
     // 创建模式：默认报工人为当前用户，报工时间为当前时间
-    formData.value.feedbackUserId = useUserStore().getUser.id
+    formData.value.feedbackUserId = getCurrentUserId()
     formData.value.feedbackTime = new Date()
     // 自动生成报工单号
     await generateCode()
diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue
index 458e6448c..ffc57ca3e 100644
--- a/src/views/mes/pro/feedback/index.vue
+++ b/src/views/mes/pro/feedback/index.vue
@@ -212,13 +212,13 @@ import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
 import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
 import FeedbackForm from './FeedbackForm.vue'
 import { MesProFeedbackStatusEnum } from '@/views/mes/utils/constants'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 
 defineOptions({ name: 'MesProFeedback' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-const currentUserId = useUserStore().getUser.id // 当前登录用户 ID
+const currentUserId = getCurrentUserId() // 当前登录用户 ID
 
 const loading = ref(true) // 列表的加载中
 const list = ref<ProFeedbackVO[]>([]) // 列表的数据
diff --git a/src/views/mes/wm/stocktaking/task/StockTakingForm.vue b/src/views/mes/wm/stocktaking/task/StockTakingForm.vue
index 29a7d59f6..55e7a7610 100644
--- a/src/views/mes/wm/stocktaking/task/StockTakingForm.vue
+++ b/src/views/mes/wm/stocktaking/task/StockTakingForm.vue
@@ -163,7 +163,7 @@ import {
   MesWmStockTakingTypeEnum,
   MesWmStockTakingTaskStatusEnum
 } from '@/views/mes/utils/constants'
-import { useUserStore } from '@/store/modules/user'
+import { getCurrentUserId } from '@/utils/auth'
 
 defineOptions({ name: 'StockTakingForm' })
 
@@ -258,7 +258,7 @@ const open = async (type: string, id?: number) => {
     }
   } else {
     // 新建时，默认设置当前登录用户为盘点人
-    formData.value.userId = useUserStore().getUser.id
+    formData.value.userId = getCurrentUserId()
   }
   // 保存原始数据快照
   originalFormData.value = JSON.stringify(formData.value)