diff --git a/src/api/bpm/userGroup/index.ts b/src/api/bpm/userGroup/index.ts index 035762bf..7d12755e 100644 --- a/src/api/bpm/userGroup/index.ts +++ b/src/api/bpm/userGroup/index.ts @@ -4,7 +4,7 @@ export type UserGroupVO = { id: number name: string description: string - memberUserIds: number[] + userIds: number[] status: number remark: string createTime: string @@ -42,6 +42,6 @@ export const getUserGroupPage = async (params) => { } // 获取用户组精简信息列表 -export const getSimpleUserGroupList = async (): Promise => { - return await request.get({ url: '/bpm/user-group/list-all-simple' }) +export const getUserGroupSimpleList = async (): Promise => { + return await request.get({ url: '/bpm/user-group/simple-list' }) } diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue index 013719ea..6431eca1 100644 --- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue +++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue @@ -212,7 +212,7 @@ onMounted(async () => { // 获得用户列表 userOptions.value = await UserApi.getSimpleUserList() // 获得用户组列表 - userGroupOptions.value = await UserGroupApi.getSimpleUserGroupList() + userGroupOptions.value = await UserGroupApi.getUserGroupSimpleList() }) onBeforeUnmount(() => { diff --git a/src/views/bpm/group/UserGroupForm.vue b/src/views/bpm/group/UserGroupForm.vue index 35d833ea..ac0cfcb3 100644 --- a/src/views/bpm/group/UserGroupForm.vue +++ b/src/views/bpm/group/UserGroupForm.vue @@ -13,8 +13,8 @@ - - + + { id: undefined, name: undefined, description: undefined, - memberUserIds: undefined, + userIds: undefined, status: CommonStatusEnum.ENABLE } formRef.value?.resetFields() diff --git a/src/views/bpm/group/index.vue b/src/views/bpm/group/index.vue index 98a445d6..62785a92 100644 --- a/src/views/bpm/group/index.vue +++ b/src/views/bpm/group/index.vue @@ -63,7 +63,7 @@