그룹가입 - 승인 처리 수정

src/components/basis/group/BasisGroupUsersGrid.js

@@ -1,25 +1,5 @@
 import { GridDatabase } from '../../crud/grid/GridDatatable';
-import {
+import { Row, Col, Card } from 'reactstrap';
-  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';
 
 export const BasisGroupUsersGrid = props => {
   return (

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'
     });
   };
 

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: ''
   });
 

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 <div>수정불가</div>;
-          // } else if (row?.groupAuthCd === 'ADMIN') {
         } else if (row?.groupAuthCd === 'LEADER') {
-          // if (my?.groupAuthCd === 'CREATER') {
           if (my?.groupAuthCd === 'MASTER') {
             return (
               <Button.Ripple
@@ -120,17 +117,13 @@ export const BasisGroupUsersContainer = props => {
                 className='badge badge-primary'
                 onClick={() => handlerUserConfirm(row?.cstmrGroupSno)}
               >
-                {/* 사용자로 변경 */}
-                {/* USER */}
                 NORMAL
               </Button.Ripple>
             );
           } else {
             return <div>수정불가</div>;
           }
-          // } 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 (
               <Button.Ripple
@@ -138,33 +131,11 @@ export const BasisGroupUsersContainer = props => {
                 className='badge badge-danger'
                 onClick={() => handlerAdminConfirm(row?.cstmrGroupSno)}
               >
-                {/* 운영자로 변경 */}
-                {/* ADMIN */}
                 LEADER
               </Button.Ripple>
             );
           }
         }
-        // return row?.groupAuthCd === 'ADMIN' ? (
-        //   <Button.Ripple
-        //     color='primary'
-        //     className='badge badge-primary'
-        //     onClick={() => handlerUserConfirm(row?.cstmrGroupSno)}
-        //   >
-        //     사용자로 변경
-        //   </Button.Ripple>
-        // ) : // <div>-</div>
-        // row?.groupAuthCd === 'CREATER' ? (
-        //   <div>수정불가</div>
-        // ) : (
-        //   <Button.Ripple
-        //     color='danger'
-        //     className='badge badge-danger'
-        //     onClick={() => handlerAdminConfirm(row?.cstmrGroupSno)}
-        //   >
-        //     운영자로 변경
-        //   </Button.Ripple>
-        // );
       }
     },
     {
@@ -180,9 +151,7 @@ export const BasisGroupUsersContainer = props => {
         // console.log('내 권한 : ', my?.groupAuthCd);
         // console.log('이 사람의 권한 : ', row?.groupAuthCd);
 
-        // if (row?.groupAuthCd === 'ADMIN') {
         if (row?.groupAuthCd === 'LEADER') {
-          // if (my?.groupAuthCd === 'CREATER') {
           if (my?.groupAuthCd === 'MASTER') {
             return (
               <Button.Ripple
@@ -192,8 +161,6 @@ export const BasisGroupUsersContainer = props => {
                   handlerCreaterConfirm(row?.cstmrGroupSno, my?.cstmrGroupSno)
                 }
               >
-                {/* 위임하기 */}
-                {/* DELEGATE */}
                 MASTER
               </Button.Ripple>
             );
@@ -246,7 +213,6 @@ export const BasisGroupUsersContainer = props => {
     setSaveData({
       cstmrGroupSno: cstmrGroupSno,
       joinYn: 'Y',
-      // groupAuthCd: 'ADMIN'
       groupAuthCd: 'LEADER'
     });
   };
@@ -267,7 +233,6 @@ export const BasisGroupUsersContainer = props => {
     setSaveData({
       cstmrGroupSno: cstmrGroupSno,
       joinYn: 'Y',
-      // groupAuthCd: 'USER'
       groupAuthCd: 'NORMAL'
     });
   };
@@ -283,13 +248,11 @@ export const BasisGroupUsersContainer = props => {
       {
         cstmrGroupSno: row,
         joinYn: 'Y',
-        // groupAuthCd: 'CREATER'
         groupAuthCd: 'MASTER'
       },
       {
         cstmrGroupSno: my,
         joinYn: 'Y',
-        // groupAuthCd: 'USER'
         groupAuthCd: 'NORMAL'
       }
     ]);