diff --git a/src/components/basis/group/BasisGroupUsersGrid.js b/src/components/basis/group/BasisGroupUsersGrid.js index debc75e..1d69875 100644 --- a/src/components/basis/group/BasisGroupUsersGrid.js +++ b/src/components/basis/group/BasisGroupUsersGrid.js @@ -1,25 +1,5 @@ import { GridDatabase } from '../../crud/grid/GridDatatable'; -import { - Row, - Col, - Table, - Badge, - UncontrolledDropdown, - DropdownMenu, - DropdownItem, - DropdownToggle, - Card, - CardHeader, - CardBody, - CardTitle, - CardSubtitle, - ButtonGroup, - Button, - Input, - CustomInput, - FormGroup -} from 'reactstrap'; -import { ExcelExportButton } from '../../crud/excel/ExcelExportButton'; +import { Row, Col, Card } from 'reactstrap'; export const BasisGroupUsersGrid = props => { return ( diff --git a/src/containers/basis/group/BasisGroupApprovalContainer.js b/src/containers/basis/group/BasisGroupApprovalContainer.js index 30d50de..42c3dcc 100644 --- a/src/containers/basis/group/BasisGroupApprovalContainer.js +++ b/src/containers/basis/group/BasisGroupApprovalContainer.js @@ -161,10 +161,12 @@ export const BasisGroupApprovalContainer = props => { desc: '해당 사용자를 승인 처리 하시겠습니까?' }); + //승인처리 시 권한부여 O setSaveData({ cstmrGroupSno: cstmrGroupSno, aprvlYn: 'Y', - aprvUserId: user?.userId + aprvUserId: user?.userId, + groupAuthCd: 'NORMAL' }); }; diff --git a/src/containers/basis/group/BasisGroupDetailJoinContainer.js b/src/containers/basis/group/BasisGroupDetailJoinContainer.js index f76b08c..090a031 100644 --- a/src/containers/basis/group/BasisGroupDetailJoinContainer.js +++ b/src/containers/basis/group/BasisGroupDetailJoinContainer.js @@ -22,10 +22,11 @@ export const BasisGroupDetailJoinContainer = props => { cstmrSno: user?.cstmrSno }); + //가입신청 시 권한부여 X const [joinData, setJoinData] = useState({ groupId: '', - // groupAuthCd: 'USER', //가입은 USER 로만 - groupAuthCd: 'NORMAL', //가입은 NORMAL 로만 + // groupAuthCd: 'NORMAL', //가입은 NORMAL 로만 + groupAuthCd: '', cstmrSno: '' }); diff --git a/src/containers/basis/group/BasisGroupUsersContainer.js b/src/containers/basis/group/BasisGroupUsersContainer.js index 66023eb..a31daf9 100644 --- a/src/containers/basis/group/BasisGroupUsersContainer.js +++ b/src/containers/basis/group/BasisGroupUsersContainer.js @@ -107,12 +107,9 @@ export const BasisGroupUsersContainer = props => { // console.log('내 권한 : ', my?.groupAuthCd); // console.log('이 사람의 권한 : ', row?.groupAuthCd); - // if (row?.groupAuthCd === 'CREATER') { if (row?.groupAuthCd === 'MASTER') { return