From 9d72100712f7e915c67558a0eb2dab7dfd737163 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, 27 Sep 2022 14:14:03 +0900 Subject: [PATCH] =?UTF-8?q?auth=20=EB=AA=85=EC=B9=AD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basis/flight/aprv/FlightPlanAprvGrid.js | 6 ++-- .../basis/dron/BasisDronContainer.js | 6 ++-- .../flight/aprv/FlightPlanAprvContainer.js | 3 +- .../group/BasisGroupApprovalContainer.js | 3 +- .../basis/group/BasisGroupContainer.js | 3 +- .../group/BasisGroupDetailJoinContainer.js | 3 +- .../basis/group/BasisGroupUsersContainer.js | 33 ++++++++++++------- 7 files changed, 38 insertions(+), 19 deletions(-) diff --git a/src/components/basis/flight/aprv/FlightPlanAprvGrid.js b/src/components/basis/flight/aprv/FlightPlanAprvGrid.js index 05caa18..1ea4aca 100644 --- a/src/components/basis/flight/aprv/FlightPlanAprvGrid.js +++ b/src/components/basis/flight/aprv/FlightPlanAprvGrid.js @@ -16,9 +16,11 @@ const FlightPlanAprvGrid = ({ useEffect(() => { joinList.forEach(c => { if (c.groupId === selectGroup.groupId) { - if (c.groupAuthCd === 'USER') { + // if (c.groupAuthCd === 'USER') { + if (c.groupAuthCd === 'NORMAL') { setAprvAuth(false); - } else if (c.groupAuthCd === 'CREATER' || c.groupAuthCd === 'ADMIN') { + // } else if (c.groupAuthCd === 'CREATER' || c.groupAuthCd === 'ADMIN') { + } else if (c.groupAuthCd === 'MASTER' || c.groupAuthCd === 'LEADER') { setAprvAuth(true); } } diff --git a/src/containers/basis/dron/BasisDronContainer.js b/src/containers/basis/dron/BasisDronContainer.js index d28123f..e7ba7fc 100644 --- a/src/containers/basis/dron/BasisDronContainer.js +++ b/src/containers/basis/dron/BasisDronContainer.js @@ -174,8 +174,10 @@ export const BasisDronContainer = props => { const handlerDetail = (groupId, groupNm, groupAuthCd, aprvlYn) => { if ( - groupAuthCd === 'CREATER' || - (aprvlYn === 'Y' && groupAuthCd === 'ADMIN') + // groupAuthCd === 'CREATER' || + groupAuthCd === 'MASTER' || + // (aprvlYn === 'Y' && groupAuthCd === 'ADMIN') + (aprvlYn === 'Y' && groupAuthCd === 'LEADER') ) { dispatch(Actions.SELECT({ groupId: groupId, groupNm: groupNm })); setParams({ diff --git a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js index c6c1960..6314924 100644 --- a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js +++ b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js @@ -100,7 +100,8 @@ const FlightPlanAprvContainer = () => { param.cstmrSno = user.cstmrSno; param.groupId = groupId; - if (groupAuthCd === 'CREATER' || groupAuthCd === 'ADMIN') { + // if (groupAuthCd === 'CREATER' || groupAuthCd === 'ADMIN') { + if (groupAuthCd === 'MASTER' || groupAuthCd === 'LEADER') { dispatch( FlightAction.FLIGHT_PLAN_GROUP_SELECT({ cstmrSno: user.cstmrSno, diff --git a/src/containers/basis/group/BasisGroupApprovalContainer.js b/src/containers/basis/group/BasisGroupApprovalContainer.js index 797efcd..30d50de 100644 --- a/src/containers/basis/group/BasisGroupApprovalContainer.js +++ b/src/containers/basis/group/BasisGroupApprovalContainer.js @@ -24,7 +24,8 @@ export const BasisGroupApprovalContainer = props => { const [saveData, setSaveData] = useState({ cstmrGroupSno: '', - aprvlYn: 'N', //가입은 USER 로만 + // aprvlYn: 'N', //가입은 USER 로만 + aprvlYn: 'N', //가입은 NORMAL 로만 aprvUserId: '' }); diff --git a/src/containers/basis/group/BasisGroupContainer.js b/src/containers/basis/group/BasisGroupContainer.js index 5bef759..75d1e63 100644 --- a/src/containers/basis/group/BasisGroupContainer.js +++ b/src/containers/basis/group/BasisGroupContainer.js @@ -138,7 +138,8 @@ export const BasisGroupContainer = props => { // selector: 'cntrlStDate', width: '150px', cell: row => { - return row?.groupAuthCd === 'CREATER' ? ( + // return row?.groupAuthCd === 'CREATER' ? ( + return row?.groupAuthCd === 'MASTER' ? (
-
) : ( { const [joinData, setJoinData] = useState({ groupId: '', - groupAuthCd: 'USER', //가입은 USER 로만 + // groupAuthCd: 'USER', //가입은 USER 로만 + groupAuthCd: 'NORMAL', //가입은 NORMAL 로만 cstmrSno: '' }); diff --git a/src/containers/basis/group/BasisGroupUsersContainer.js b/src/containers/basis/group/BasisGroupUsersContainer.js index 491fb26..66023eb 100644 --- a/src/containers/basis/group/BasisGroupUsersContainer.js +++ b/src/containers/basis/group/BasisGroupUsersContainer.js @@ -107,10 +107,13 @@ export const BasisGroupUsersContainer = props => { // console.log('내 권한 : ', my?.groupAuthCd); // console.log('이 사람의 권한 : ', row?.groupAuthCd); - if (row?.groupAuthCd === 'CREATER') { + // if (row?.groupAuthCd === 'CREATER') { + if (row?.groupAuthCd === 'MASTER') { return
수정불가
; - } else if (row?.groupAuthCd === 'ADMIN') { - if (my?.groupAuthCd === 'CREATER') { + // } else if (row?.groupAuthCd === 'ADMIN') { + } else if (row?.groupAuthCd === 'LEADER') { + // if (my?.groupAuthCd === 'CREATER') { + if (my?.groupAuthCd === 'MASTER') { return ( { } else { return
수정불가
; } - } else if (row?.groupAuthCd === 'USER') { - if (my?.groupAuthCd === 'CREATER' || my?.groupAuthCd === 'ADMIN') { + // } else if (row?.groupAuthCd === 'USER') { + } else if (row?.groupAuthCd === 'NORMAL') { + // if (my?.groupAuthCd === 'CREATER' || my?.groupAuthCd === 'ADMIN') { + if (my?.groupAuthCd === 'MASTER' || my?.groupAuthCd === 'LEADER') { return ( { // console.log('내 권한 : ', my?.groupAuthCd); // console.log('이 사람의 권한 : ', row?.groupAuthCd); - if (row?.groupAuthCd === 'ADMIN') { - if (my?.groupAuthCd === 'CREATER') { + // if (row?.groupAuthCd === 'ADMIN') { + if (row?.groupAuthCd === 'LEADER') { + // if (my?.groupAuthCd === 'CREATER') { + if (my?.groupAuthCd === 'MASTER') { return ( { setSaveData({ cstmrGroupSno: cstmrGroupSno, joinYn: 'Y', - groupAuthCd: 'ADMIN' + // groupAuthCd: 'ADMIN' + groupAuthCd: 'LEADER' }); }; @@ -259,7 +267,8 @@ export const BasisGroupUsersContainer = props => { setSaveData({ cstmrGroupSno: cstmrGroupSno, joinYn: 'Y', - groupAuthCd: 'USER' + // groupAuthCd: 'USER' + groupAuthCd: 'NORMAL' }); }; @@ -274,12 +283,14 @@ export const BasisGroupUsersContainer = props => { { cstmrGroupSno: row, joinYn: 'Y', - groupAuthCd: 'CREATER' + // groupAuthCd: 'CREATER' + groupAuthCd: 'MASTER' }, { cstmrGroupSno: my, joinYn: 'Y', - groupAuthCd: 'USER' + // groupAuthCd: 'USER' + groupAuthCd: 'NORMAL' } ]); };