From b07ab6de60e67aa1f1019d9a1d11a24328d9b9b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Tue, 11 Oct 2022 10:49:11 +0900 Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20-=20=ED=8E=98=EC=9D=B4=EC=A7=95=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=ED=91=9C=EC=B6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/basis/flight/plan/FlightPlanGrid.js | 3 +-- src/containers/basis/group/BasisGroupUsersContainer.js | 1 + src/modules/basis/group/sagas/basisGroupSaga.ts | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/basis/flight/plan/FlightPlanGrid.js b/src/components/basis/flight/plan/FlightPlanGrid.js index eebbb28..9dc8d87 100644 --- a/src/components/basis/flight/plan/FlightPlanGrid.js +++ b/src/components/basis/flight/plan/FlightPlanGrid.js @@ -54,7 +54,6 @@ const FlightPlanGrid = ({ mine = true; } } - console.log(row.createUserId, user.userId); return ( <> @@ -117,7 +116,7 @@ const FlightPlanGrid = ({ paginationRowsPerPageOptions={paginationRowsPerPageOptions} handlerPageChange={handlerPageChange} total={total} - // pagination={props.pagination} + // pagination={props.pagination} /> {/* 검색된 데이터가 없습니다. */} diff --git a/src/containers/basis/group/BasisGroupUsersContainer.js b/src/containers/basis/group/BasisGroupUsersContainer.js index c82925a..1e773fb 100644 --- a/src/containers/basis/group/BasisGroupUsersContainer.js +++ b/src/containers/basis/group/BasisGroupUsersContainer.js @@ -318,6 +318,7 @@ export const BasisGroupUsersContainer = props => { const param = params; param.groupId = groupId; param.memberNm = ''; + param.page = 1; dispatch( Actions.USER_LIST.request({ diff --git a/src/modules/basis/group/sagas/basisGroupSaga.ts b/src/modules/basis/group/sagas/basisGroupSaga.ts index 0329ae0..c427ece 100644 --- a/src/modules/basis/group/sagas/basisGroupSaga.ts +++ b/src/modules/basis/group/sagas/basisGroupSaga.ts @@ -458,16 +458,16 @@ function* updateAprvSaga( } } +//사용자 관리 - 사용자 목록 function* userListSaga(action: ActionType) { try { const { searchParams } = action.payload; const res = yield call(Apis.groupAPI.listGroupUser, searchParams); - const { data, count } = res; - + const { data } = res; yield put( Actions.USER_LIST.success({ - data: data, - count: count + data: data.items, + count: data.total }) ); } catch (error) {