Browse Source

auth 명칭 수정

feature/auth
junh_eee(이준희) 2 years ago
parent
commit
9d72100712
  1. 6
      src/components/basis/flight/aprv/FlightPlanAprvGrid.js
  2. 6
      src/containers/basis/dron/BasisDronContainer.js
  3. 3
      src/containers/basis/flight/aprv/FlightPlanAprvContainer.js
  4. 3
      src/containers/basis/group/BasisGroupApprovalContainer.js
  5. 3
      src/containers/basis/group/BasisGroupContainer.js
  6. 3
      src/containers/basis/group/BasisGroupDetailJoinContainer.js
  7. 33
      src/containers/basis/group/BasisGroupUsersContainer.js

6
src/components/basis/flight/aprv/FlightPlanAprvGrid.js

@ -16,9 +16,11 @@ const FlightPlanAprvGrid = ({
useEffect(() => { useEffect(() => {
joinList.forEach(c => { joinList.forEach(c => {
if (c.groupId === selectGroup.groupId) { if (c.groupId === selectGroup.groupId) {
if (c.groupAuthCd === 'USER') { // if (c.groupAuthCd === 'USER') {
if (c.groupAuthCd === 'NORMAL') {
setAprvAuth(false); 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); setAprvAuth(true);
} }
} }

6
src/containers/basis/dron/BasisDronContainer.js

@ -174,8 +174,10 @@ export const BasisDronContainer = props => {
const handlerDetail = (groupId, groupNm, groupAuthCd, aprvlYn) => { const handlerDetail = (groupId, groupNm, groupAuthCd, aprvlYn) => {
if ( if (
groupAuthCd === 'CREATER' || // groupAuthCd === 'CREATER' ||
(aprvlYn === 'Y' && groupAuthCd === 'ADMIN') groupAuthCd === 'MASTER' ||
// (aprvlYn === 'Y' && groupAuthCd === 'ADMIN')
(aprvlYn === 'Y' && groupAuthCd === 'LEADER')
) { ) {
dispatch(Actions.SELECT({ groupId: groupId, groupNm: groupNm })); dispatch(Actions.SELECT({ groupId: groupId, groupNm: groupNm }));
setParams({ setParams({

3
src/containers/basis/flight/aprv/FlightPlanAprvContainer.js

@ -100,7 +100,8 @@ const FlightPlanAprvContainer = () => {
param.cstmrSno = user.cstmrSno; param.cstmrSno = user.cstmrSno;
param.groupId = groupId; param.groupId = groupId;
if (groupAuthCd === 'CREATER' || groupAuthCd === 'ADMIN') { // if (groupAuthCd === 'CREATER' || groupAuthCd === 'ADMIN') {
if (groupAuthCd === 'MASTER' || groupAuthCd === 'LEADER') {
dispatch( dispatch(
FlightAction.FLIGHT_PLAN_GROUP_SELECT({ FlightAction.FLIGHT_PLAN_GROUP_SELECT({
cstmrSno: user.cstmrSno, cstmrSno: user.cstmrSno,

3
src/containers/basis/group/BasisGroupApprovalContainer.js

@ -24,7 +24,8 @@ export const BasisGroupApprovalContainer = props => {
const [saveData, setSaveData] = useState({ const [saveData, setSaveData] = useState({
cstmrGroupSno: '', cstmrGroupSno: '',
aprvlYn: 'N', //가입은 USER 로만 // aprvlYn: 'N', //가입은 USER 로만
aprvlYn: 'N', //가입은 NORMAL 로만
aprvUserId: '' aprvUserId: ''
}); });

3
src/containers/basis/group/BasisGroupContainer.js

@ -138,7 +138,8 @@ export const BasisGroupContainer = props => {
// selector: 'cntrlStDate', // selector: 'cntrlStDate',
width: '150px', width: '150px',
cell: row => { cell: row => {
return row?.groupAuthCd === 'CREATER' ? ( // return row?.groupAuthCd === 'CREATER' ? (
return row?.groupAuthCd === 'MASTER' ? (
<div>-</div> <div>-</div>
) : ( ) : (
<Button.Ripple <Button.Ripple

3
src/containers/basis/group/BasisGroupDetailJoinContainer.js

@ -24,7 +24,8 @@ export const BasisGroupDetailJoinContainer = props => {
const [joinData, setJoinData] = useState({ const [joinData, setJoinData] = useState({
groupId: '', groupId: '',
groupAuthCd: 'USER', //가입은 USER 로만 // groupAuthCd: 'USER', //가입은 USER 로만
groupAuthCd: 'NORMAL', //가입은 NORMAL 로만
cstmrSno: '' cstmrSno: ''
}); });

33
src/containers/basis/group/BasisGroupUsersContainer.js

@ -107,10 +107,13 @@ export const BasisGroupUsersContainer = props => {
// console.log('내 권한 : ', my?.groupAuthCd); // console.log('내 권한 : ', my?.groupAuthCd);
// console.log('이 사람의 권한 : ', row?.groupAuthCd); // console.log('이 사람의 권한 : ', row?.groupAuthCd);
if (row?.groupAuthCd === 'CREATER') { // if (row?.groupAuthCd === 'CREATER') {
if (row?.groupAuthCd === 'MASTER') {
return <div>수정불가</div>; return <div>수정불가</div>;
} else if (row?.groupAuthCd === 'ADMIN') { // } else if (row?.groupAuthCd === 'ADMIN') {
if (my?.groupAuthCd === 'CREATER') { } else if (row?.groupAuthCd === 'LEADER') {
// if (my?.groupAuthCd === 'CREATER') {
if (my?.groupAuthCd === 'MASTER') {
return ( return (
<Button.Ripple <Button.Ripple
color='primary' color='primary'
@ -125,8 +128,10 @@ export const BasisGroupUsersContainer = props => {
} else { } else {
return <div>수정불가</div>; return <div>수정불가</div>;
} }
} else if (row?.groupAuthCd === 'USER') { // } else if (row?.groupAuthCd === 'USER') {
if (my?.groupAuthCd === 'CREATER' || my?.groupAuthCd === 'ADMIN') { } else if (row?.groupAuthCd === 'NORMAL') {
// if (my?.groupAuthCd === 'CREATER' || my?.groupAuthCd === 'ADMIN') {
if (my?.groupAuthCd === 'MASTER' || my?.groupAuthCd === 'LEADER') {
return ( return (
<Button.Ripple <Button.Ripple
color='danger' color='danger'
@ -175,8 +180,10 @@ export const BasisGroupUsersContainer = props => {
// console.log('내 권한 : ', my?.groupAuthCd); // console.log('내 권한 : ', my?.groupAuthCd);
// console.log('이 사람의 권한 : ', row?.groupAuthCd); // console.log('이 사람의 권한 : ', row?.groupAuthCd);
if (row?.groupAuthCd === 'ADMIN') { // if (row?.groupAuthCd === 'ADMIN') {
if (my?.groupAuthCd === 'CREATER') { if (row?.groupAuthCd === 'LEADER') {
// if (my?.groupAuthCd === 'CREATER') {
if (my?.groupAuthCd === 'MASTER') {
return ( return (
<Button.Ripple <Button.Ripple
color='warning' color='warning'
@ -239,7 +246,8 @@ export const BasisGroupUsersContainer = props => {
setSaveData({ setSaveData({
cstmrGroupSno: cstmrGroupSno, cstmrGroupSno: cstmrGroupSno,
joinYn: 'Y', joinYn: 'Y',
groupAuthCd: 'ADMIN' // groupAuthCd: 'ADMIN'
groupAuthCd: 'LEADER'
}); });
}; };
@ -259,7 +267,8 @@ export const BasisGroupUsersContainer = props => {
setSaveData({ setSaveData({
cstmrGroupSno: cstmrGroupSno, cstmrGroupSno: cstmrGroupSno,
joinYn: 'Y', joinYn: 'Y',
groupAuthCd: 'USER' // groupAuthCd: 'USER'
groupAuthCd: 'NORMAL'
}); });
}; };
@ -274,12 +283,14 @@ export const BasisGroupUsersContainer = props => {
{ {
cstmrGroupSno: row, cstmrGroupSno: row,
joinYn: 'Y', joinYn: 'Y',
groupAuthCd: 'CREATER' // groupAuthCd: 'CREATER'
groupAuthCd: 'MASTER'
}, },
{ {
cstmrGroupSno: my, cstmrGroupSno: my,
joinYn: 'Y', joinYn: 'Y',
groupAuthCd: 'USER' // groupAuthCd: 'USER'
groupAuthCd: 'NORMAL'
} }
]); ]);
}; };

Loading…
Cancel
Save