diff --git a/src/containers/basis/group/BasisGroupApprovalContainer.js b/src/containers/basis/group/BasisGroupApprovalContainer.js
index 3dc72d6..2a8364a 100644
--- a/src/containers/basis/group/BasisGroupApprovalContainer.js
+++ b/src/containers/basis/group/BasisGroupApprovalContainer.js
@@ -10,11 +10,17 @@ import { InfoModal } from '../../../components/modal/InfoModal';
import { BasisGroupGrid } from '../../../components/basis/group/BasisGroupGrid';
export const BasisGroupApprovalContainer = props => {
- const { aprvList, aprvCount } = useSelector(state => state.groupState);
+ const {
+ aprvList,
+ aprvCount,
+ joinList,
+ joinListCount,
+ groupList,
+ groupListCount,
+ selectData
+ } = useSelector(state => state.groupState);
const { user } = useSelector(state => state.authState);
- const { joinList, joinListCount } = useSelector(state => state.groupState);
- const { selectData } = useSelector(state => state.groupState);
const dispatch = useDispatch();
const titleName = '승인관리';
@@ -132,62 +138,19 @@ export const BasisGroupApprovalContainer = props => {
groupId: selectData?.groupId,
aprvYn: ''
});
- dispatch(
- // GroupActions.JOIN_LIST.request({
- Actions.JOIN_LIST.request({
- cstmrSno: user?.cstmrSno,
- groupId: selectData?.groupId
- })
- );
- }
- }, [user]);
- const dronColumns = [
- {
- name: '모델명',
- selector: row => row.arcrftModelNm,
- minWidth: '102px',
- sortable: true,
- cell: row => {
- return row?.arcrftModelNm;
- }
- },
- {
- name: '종류',
- selector: row => row.arcrftTypeCd,
- minWidth: '102px',
- sortable: true,
- cell: row => {
- return GET_ARCTFT_TYPE_CD(row?.arcrftTypeCd);
- }
- },
- {
- name: '제작사',
- selector: row => row.prdctCmpnNm,
- minWidth: '102px',
- sortable: true,
- cell: row => {
- return row?.prdctCmpnNm;
- }
- },
- {
- name: '수정일자',
- selector: row => row.updateDt,
- minWidth: '102px',
- sortable: true,
- cell: row => {
- return moment(row?.updateDt).format('MM-DD HH:mm');
- }
- },
- {
- name: '상세보기',
- // selector: 'cntrlStDate',
- // minWidth: '102px',
- sortable: true,
- cell: row => {
- return 상세보기;
+ if (user.authId === 'SUPER' || user.authId === 'ADMIN') {
+ dispatch(Actions.GROUP_LIST.request(user?.cstmrSno));
+ } else {
+ dispatch(
+ Actions.JOIN_LIST.request({
+ cstmrSno: user?.cstmrSno,
+ groupId: selectData?.groupId
+ })
+ );
}
}
- ];
+ }, [user]);
+
const [saveData, setSaveData] = useState({
cstmrGroupSno: '',
// aprvlYn: 'N', //가입은 USER 로만
@@ -356,13 +319,25 @@ export const BasisGroupApprovalContainer = props => {
{/*
+ {user ? (
+ <>
+
+ >
+ ) : (
+ <>>
+ )}
{!selectData ? (
diff --git a/src/modules/basis/group/actions/basisGroupAction.ts b/src/modules/basis/group/actions/basisGroupAction.ts
index 95a5d24..0278d78 100644
--- a/src/modules/basis/group/actions/basisGroupAction.ts
+++ b/src/modules/basis/group/actions/basisGroupAction.ts
@@ -155,7 +155,8 @@ export const GROUP_LIST = createAsyncAction(
GROUP_LIST_REQUEST,
GROUP_LIST_SUCCESS,
GROUP_LIST_FAILURE
-)();
+ // )();
+)();
export const GROUP_CREATEID = createAsyncAction(
GROUP_CREATEID_REQUEST,
diff --git a/src/modules/basis/group/apis/basisGroupApi.ts b/src/modules/basis/group/apis/basisGroupApi.ts
index 9024403..41f6a55 100644
--- a/src/modules/basis/group/apis/basisGroupApi.ts
+++ b/src/modules/basis/group/apis/basisGroupApi.ts
@@ -26,11 +26,11 @@ export const groupAPI = {
return await axios.get(`api/bas/group/joinlist${queryString}`);
},
grouplist: async (data: string) => {
- const queryString = qs.stringify(data, {
+ const id = qs.stringify(data, {
addQueryPrefix: true,
arrayFormat: 'repeat'
});
- return await axios.get(`api/bas/group/grouplist${queryString}`);
+ return await axios.get(`api/bas/group/grouplist${id}`);
},
detailGroup: async (id: string) => {
return await axios.get(`api/bas/group/detail/${id}`);
diff --git a/src/modules/basis/group/sagas/basisGroupSaga.ts b/src/modules/basis/group/sagas/basisGroupSaga.ts
index fc0fc7d..853cfb9 100644
--- a/src/modules/basis/group/sagas/basisGroupSaga.ts
+++ b/src/modules/basis/group/sagas/basisGroupSaga.ts
@@ -299,8 +299,8 @@ function* deleteGroupSaga(
function* listGroupSaga(action: ActionType) {
try {
- const { searchParams } = action.payload;
- const res = yield call(Apis.groupAPI.listGroup, searchParams);
+ const id = action.payload;
+ const res = yield call(Apis.groupAPI.listGroup, id);
const { data, count } = res;
yield put(