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 @@