Merge branch 'master' of http://gitea.palntour.com/pav/pav-home

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}
                 />
                 {/* 검색된 데이터가 없습니다. */}
               </div>

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({

src/modules/basis/group/sagas/basisGroupSaga.ts

@@ -458,16 +458,16 @@ function* updateAprvSaga(
   }
 }
 
+//사용자 관리 - 사용자 목록
 function* userListSaga(action: ActionType<typeof Actions.USER_LIST.request>) {
   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) {