diff --git a/ui/src/api/system/user-group.ts b/ui/src/api/system/user-group.ts index e6826bfde..ac1d23c23 100644 --- a/ui/src/api/system/user-group.ts +++ b/ui/src/api/system/user-group.ts @@ -1,8 +1,8 @@ -import { Result } from '@/request/Result' -import { get, post, del } from '@/request/index' -import type { Ref } from 'vue' -import type { ChatUserGroupUserItem, } from '@/api/type/systemChatUser' -import type { pageRequest, PageList, ListItem } from '@/api/type/common' +import {Result} from '@/request/Result' +import {get, post, del} from '@/request/index' +import type {Ref} from 'vue' +import type {ChatUserGroupUserItem,} from '@/api/type/systemChatUser' +import type {pageRequest, PageList, ListItem} from '@/api/type/common' const prefix = '/system/group' @@ -67,12 +67,12 @@ const postRemoveMember: ( const getUserListByGroup: ( user_group_id: string, page: pageRequest, - username: string, + params ?: any, loading?: Ref, -) => Promise>> = (user_group_id, page, username, loading) => { +) => Promise>> = (user_group_id, page, params, loading) => { return get( `${prefix}/${user_group_id}/user_list/${page.current_page}/${page.page_size}`, - username ? { username } : undefined, + params ? params : undefined, loading, ) } diff --git a/ui/src/views/system-chat-user/group/index.vue b/ui/src/views/system-chat-user/group/index.vue index 079c745eb..b32f33b80 100644 --- a/ui/src/views/system-chat-user/group/index.vue +++ b/ui/src/views/system-chat-user/group/index.vue @@ -27,7 +27,9 @@ [PermissionConst.WORKSPACE_USER_GROUP_CREATE, PermissionConst.USER_GROUP_CREATE], [],'OR',)" > - + + + @@ -57,7 +59,7 @@ - +