From 3b9743587c028e7c324bb543741ec991af885893 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?=
 <junh_eee@naver.com>
Date: Wed, 5 Oct 2022 15:56:36 +0900
Subject: [PATCH] =?UTF-8?q?[api=EA=BC=AC=EC=9E=84=20=EC=88=98=EC=A0=95]=20?=
 =?UTF-8?q?-=20=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D=EB=AA=A9=EB=A1=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basis/flight/plan/FlightPlanContainer.js  | 50 ++++++++++++++-----
 1 file changed, 38 insertions(+), 12 deletions(-)

diff --git a/src/containers/basis/flight/plan/FlightPlanContainer.js b/src/containers/basis/flight/plan/FlightPlanContainer.js
index 12a8f48..6afc88e 100644
--- a/src/containers/basis/flight/plan/FlightPlanContainer.js
+++ b/src/containers/basis/flight/plan/FlightPlanContainer.js
@@ -1,16 +1,17 @@
 import React, { useEffect, useState } from 'react';
-import moment, { suppressDeprecationWarnings } from 'moment';
-import { Link, Redirect, useHistory } from 'react-router-dom';
+import moment from 'moment';
+import { useHistory } from 'react-router-dom';
 import FlightPlanGrid from '../../../../components/basis/flight/plan/FlightPlanGrid';
 import { CustomMainLayout } from '../../../../components/layout/CustomMainLayout';
 import FlightPlanSearch from '../../../../components/basis/flight/plan/FlightPlanSearch';
 import { useDispatch, useSelector, shallowEqual } from 'react-redux';
 import * as FlightAction from '../../../../modules/basis/flight/actions/basisFlightAction';
-import { FlightPlanListRqData } from '../../../../modules/basis/flight/models/basisFlightModel';
 import { Row, Col, Button } from 'reactstrap';
-import { JOIN_LIST } from '../../../../modules/basis/group/actions/basisGroupAction';
+import {
+  JOIN_LIST,
+  GROUP_LIST
+} from '../../../../modules/basis/group/actions/basisGroupAction';
 import FlightPlanGroupGrid from '../../../../components/basis/flight/plan/FlightPlanGroupGrid';
-import { BasisGroupDronGrid } from '../../../../components/basis/dron/BasisGroupDronGrid';
 
 const initSearchData = {
   schFltStDt: moment()
@@ -34,7 +35,9 @@ const FlightPlanContainer = () => {
     selectGroup,
     areaCoordList
   } = useSelector(state => state.flightState);
-  const { joinList, joinListCount } = useSelector(state => state.groupState);
+  const { joinList, joinListCount, groupList, groupListCount } = useSelector(
+    state => state.groupState
+  );
   const { user } = useSelector(state => state.authState, shallowEqual);
 
   const [params, setParams] = useState({});
@@ -102,11 +105,15 @@ const FlightPlanContainer = () => {
 
   useEffect(() => {
     if (user?.cstmrSno) {
-      dispatch(
-        JOIN_LIST.request({
-          cstmrSno: user?.cstmrSno
-        })
-      );
+      if (user.authId === 'SUPER' || user.authId === 'ADMIN') {
+        dispatch(GROUP_LIST.request(user.cstmrSno));
+      } else {
+        dispatch(
+          JOIN_LIST.request({
+            cstmrSno: user?.cstmrSno
+          })
+        );
+      }
     }
   }, [user]);
 
@@ -118,7 +125,7 @@ const FlightPlanContainer = () => {
     <CustomMainLayout title={'비행계획서 신청'}>
       <div className='pal-card-box'>
         <Row>
-          <Col sm='4'>
+          {/* <Col sm='4'>
             <FlightPlanGroupGrid
               data={joinList}
               count={joinListCount}
@@ -126,6 +133,25 @@ const FlightPlanContainer = () => {
               handleGroupSelect={handleGroupSelect}
               handlerGroupCancel={handlerGroupCancel}
             />
+          </Col> */}
+          <Col sm='4'>
+            {user ? (
+              <>
+                <FlightPlanGroupGrid
+                  {...(user?.authId === 'SUPER' || user?.authId === 'ADMIN'
+                    ? { data: groupList }
+                    : { data: joinList })}
+                  {...(user?.authId === 'SUPER' || user?.authId === 'ADMIN'
+                    ? { count: groupListCount }
+                    : { count: joinListCount })}
+                  selectGroup={selectGroup}
+                  handleGroupSelect={handleGroupSelect}
+                  handlerGroupCancel={handlerGroupCancel}
+                />
+              </>
+            ) : (
+              <></>
+            )}
           </Col>
           <Col sm='8'>
             {selectGroup.cstmrSno !== 0 ? (