@@ -485,7 +494,9 @@ export const BasisGroupUsersContainer = props => {
data={userList}
title={'사용자'}
columns={userColumns}
- count={userCount}
+ count={count}
+ total={total}
+ handlerPageChange={handlerPageChange}
pagination={true}
paginationPerPage={10}
paginationRowsPerPageOptions={[10, 20, 30, 40]}
diff --git a/src/modules/basis/group/actions/basisGroupAction.ts b/src/modules/basis/group/actions/basisGroupAction.ts
index 31cef2a7..29d8165e 100644
--- a/src/modules/basis/group/actions/basisGroupAction.ts
+++ b/src/modules/basis/group/actions/basisGroupAction.ts
@@ -202,7 +202,11 @@ export const USER_LIST = createAsyncAction(
USER_LIST_REQUEST,
USER_LIST_SUCCESS,
USER_LIST_FAILURE
-)();
+)<
+ GroupState,
+ { data: UserGroupData[]; count: number; total: number },
+ AxiosError
+>();
export const USER_UPDATE = createAsyncAction(
USER_UPDATE_REQUEST,
diff --git a/src/modules/basis/group/models/basisGroupModel.ts b/src/modules/basis/group/models/basisGroupModel.ts
index 7deffc47..d4483c30 100644
--- a/src/modules/basis/group/models/basisGroupModel.ts
+++ b/src/modules/basis/group/models/basisGroupModel.ts
@@ -2,26 +2,27 @@ import { ErrorModel } from '../../../models/ComnModel';
export interface GroupState {
myList: GroupData[] | undefined;
- myListCount: number | 0;
groupDetail: GroupData | undefined;
joinList: JoinGroupData[] | undefined;
- joinListCount: number | 0;
mainList: MainGroupData[] | undefined;
- mainListCount: number | 0;
groupList: GroupData[] | undefined;
- groupListCount: number | 0;
aprvList: AprvGroupData[] | undefined;
- aprvCount: number | 0;
userList: UserGroupData[] | undefined;
- userCount: number | 0;
+ selectData: SelectData | undefined;
groupId: string | '';
newGroupId: String | '';
searchParams: string | '';
error: ErrorModel | undefined;
- selectData: SelectData | undefined;
page: number | 1;
total: number | 0;
count: number | 0;
+
+ myListCount: number | 0;
+ joinListCount: number | 0;
+ mainListCount: number | 0;
+ groupListCount: number | 0;
+ aprvCount: number | 0;
+ userCount: number | 0;
}
export interface GroupSearchData {
@@ -85,6 +86,7 @@ export interface AprvGroupData {
export interface UserGroupState {
userGroupData: UserGroupData[] | undefined;
}
+
export interface UserGroupData {
cstmrGroupSno: number;
groupId: string;
@@ -123,5 +125,5 @@ export const initGroup = {
selectData: undefined,
page: 1,
total: 0,
- count:0
+ count: 0
};
diff --git a/src/modules/basis/group/reducers/basisGroupReducer.ts b/src/modules/basis/group/reducers/basisGroupReducer.ts
index 77d15376..dff516dc 100644
--- a/src/modules/basis/group/reducers/basisGroupReducer.ts
+++ b/src/modules/basis/group/reducers/basisGroupReducer.ts
@@ -95,9 +95,10 @@ export const groupReducer = createReducer(
)
.handleAction(Actions.USER_LIST.success, (state, action) =>
produce(state, draft => {
- const { data, count } = action.payload;
+ const { data, count, total } = action.payload;
draft.userList = data;
- draft.userCount = count;
+ draft.count = count;
+ draft.total = total;
})
)
.handleAction(Actions.SELECT, (state, action) =>
diff --git a/src/modules/basis/group/sagas/basisGroupSaga.ts b/src/modules/basis/group/sagas/basisGroupSaga.ts
index c427ece3..407d37bd 100644
--- a/src/modules/basis/group/sagas/basisGroupSaga.ts
+++ b/src/modules/basis/group/sagas/basisGroupSaga.ts
@@ -463,11 +463,18 @@ function* userListSaga(action: ActionType) {
try {
const { searchParams } = action.payload;
const res = yield call(Apis.groupAPI.listGroupUser, searchParams);
- const { data } = res;
+ // const { data } = res;
+ const {
+ data: { items, total },
+ count
+ } = res;
yield put(
Actions.USER_LIST.success({
- data: data.items,
- count: data.total
+ // data: data.items,
+ // count: data.total
+ data: items,
+ count,
+ total
})
);
} catch (error) {