diff --git a/src/containers/basis/group/BasisGroupContainer.js b/src/containers/basis/group/BasisGroupContainer.js
index 36369c8..e6c9440 100644
--- a/src/containers/basis/group/BasisGroupContainer.js
+++ b/src/containers/basis/group/BasisGroupContainer.js
@@ -9,7 +9,7 @@ import { ConfirmModal } from '../../../components/modal/ConfirmModal';
import * as Actions from '../../../modules/basis/group/actions/basisGroupAction';
export const BasisGroupContainer = props => {
- const { myList, myListCount, mainList, mainListCount } = useSelector(
+ const { myList, myListCount, joinList, joinListCount } = useSelector(
state => state.groupState
);
@@ -161,7 +161,8 @@ export const BasisGroupContainer = props => {
const handlerSearch = () => {
if (user?.cstmrSno) {
dispatch(Actions.MY_LIST.request({ cstmrSno: user?.cstmrSno }));
- dispatch(Actions.GROUP_MAIN_LIST.request({ cstmrSno: user?.cstmrSno }));
+ // dispatch(Actions.GROUP_MAIN_LIST.request({ cstmrSno: user?.cstmrSno }));
+ dispatch(Actions.JOIN_LIST.request({ cstmrSno: user?.cstmrSno }));
}
};
@@ -207,10 +208,10 @@ export const BasisGroupContainer = props => {
/>
diff --git a/src/modules/basis/group/actions/basisGroupAction.ts b/src/modules/basis/group/actions/basisGroupAction.ts
index 1e4adca..95a5d24 100644
--- a/src/modules/basis/group/actions/basisGroupAction.ts
+++ b/src/modules/basis/group/actions/basisGroupAction.ts
@@ -33,7 +33,7 @@ const GROUP_CREATE_REQUEST = 'basis/group/GROUP_CREATE_REQUEST';
const GROUP_CREATE_SUCCESS = 'basis/group/GROUP_CREATE_SUCCESS';
const GROUP_CREATE_FAILURE = 'basis/group/GROUP_CREATE_FAILURE';
-//## 그룹수정
+//## 그룹 수정
const GROUP_UPDATE_REQUEST = 'basis/group/GROUP_UPDATE_REQUEST';
const GROUP_UPDATE_SUCCESS = 'basis/group/GROUP_UPDATE_SUCCESS';
const GROUP_UPDATE_FAILURE = 'basis/group/GROUP_UPDATE_FAILURE';
diff --git a/src/modules/basis/group/apis/basisGroupApi.ts b/src/modules/basis/group/apis/basisGroupApi.ts
index 393e557..9024403 100644
--- a/src/modules/basis/group/apis/basisGroupApi.ts
+++ b/src/modules/basis/group/apis/basisGroupApi.ts
@@ -25,7 +25,7 @@ export const groupAPI = {
});
return await axios.get(`api/bas/group/joinlist${queryString}`);
},
- Grouplist: async (data: string) => {
+ grouplist: async (data: string) => {
const queryString = qs.stringify(data, {
addQueryPrefix: true,
arrayFormat: 'repeat'
diff --git a/src/modules/basis/group/models/basisGroupModel.ts b/src/modules/basis/group/models/basisGroupModel.ts
index 632cc77..4068d6f 100644
--- a/src/modules/basis/group/models/basisGroupModel.ts
+++ b/src/modules/basis/group/models/basisGroupModel.ts
@@ -9,7 +9,7 @@ export interface GroupState {
mainList: MainGroupData[] | undefined;
mainListCount: number | 0;
groupList: GroupData[] | undefined;
- groupCount: number | 0;
+ groupListCount: number | 0;
aprvList: AprvGroupData[] | undefined;
aprvCount: number | 0;
userList: UserGroupData[] | undefined;
@@ -34,6 +34,7 @@ export interface GroupData {
createDt: Date;
updateDt: Date;
}
+
export interface SelectData {
groupId: string;
groupNm: string;
@@ -107,7 +108,7 @@ export const initGroup = {
mainList: undefined,
mainListCount: 0,
groupList: undefined,
- groupCount: 0,
+ groupListCount: 0,
aprvList: undefined,
aprvCount: 0,
userList: undefined,
diff --git a/src/modules/basis/group/reducers/basisGroupReducer.ts b/src/modules/basis/group/reducers/basisGroupReducer.ts
index 76b1b21..d5616e7 100644
--- a/src/modules/basis/group/reducers/basisGroupReducer.ts
+++ b/src/modules/basis/group/reducers/basisGroupReducer.ts
@@ -74,7 +74,7 @@ export const groupReducer = createReducer(
produce(state, draft => {
const { data, count } = action.payload;
draft.groupList = data;
- draft.groupCount = count;
+ draft.groupListCount = count;
})
)
.handleAction(Actions.GROUP_JOINLIST.success, (state, action) =>
diff --git a/src/modules/basis/group/sagas/basisGroupSaga.ts b/src/modules/basis/group/sagas/basisGroupSaga.ts
index 62240c1..fc0fc7d 100644
--- a/src/modules/basis/group/sagas/basisGroupSaga.ts
+++ b/src/modules/basis/group/sagas/basisGroupSaga.ts
@@ -86,7 +86,7 @@ function* GrouplistSaga(
try {
const params = action.payload;
- const res = yield call(Apis.groupAPI.Grouplist, params);
+ const res = yield call(Apis.groupAPI.grouplist, params);
const { data, count, errorCode, errorMessage } = res;
if (errorCode) {
// 오류메시지 호출