[api꼬임 수정] - 비행이력현황

src/containers/analysis/history/AnalysisHistoryContainer.js

@@ -7,7 +7,10 @@ import { AnalysisHistorySearch } from '../../../components/analysis/history/Anal
 import { CustomMainLayout } from '../../../components/layout/CustomMainLayout';
 import * as Actions from '../../../modules/analysis/history/actions/analysisHistoryAction';
 import FlightPlanGroupGrid from '../../../components/basis/flight/plan/FlightPlanGroupGrid';
-import { JOIN_LIST } from '../../../modules/basis/group/actions/basisGroupAction';
+import {
+  JOIN_LIST,
+  GROUP_LIST
+} from '../../../modules/basis/group/actions/basisGroupAction';
 import {
   Col,
   Row,
@@ -39,7 +42,9 @@ export const AnalysisHistoryContainer = props => {
     aprvProc,
     selectGroup
   } = 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 [isClick, setIsClick] = useState(-1);
@@ -60,11 +65,15 @@ export const AnalysisHistoryContainer = props => {
 
   useEffect(() => {
     if (user?.cstmrSno) {
-      dispatch(
+      if (user.authId === 'SUPER' || user.authId === 'ADMIN') {
-        JOIN_LIST.request({
+        dispatch(GROUP_LIST.request(user.cstmrSno));
-          cstmrSno: user?.cstmrSno
+      } else {
-        })
+        dispatch(
-      );
+          JOIN_LIST.request({
+            cstmrSno: user?.cstmrSno
+          })
+        );
+      }
     }
   }, [user]);
 
@@ -289,7 +298,7 @@ export const AnalysisHistoryContainer = props => {
     <CustomMainLayout title={titleName}>
       <div className='pal-card-box'>
         <Row>
-          <Col sm='4'>
+          {/* <Col sm='4'>
             <FlightPlanGroupGrid
               data={joinList}
               count={joinListCount}
@@ -297,6 +306,25 @@ export const AnalysisHistoryContainer = props => {
               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 ? (