[api꼬임 수정]기체목록

src/containers/basis/dron/BasisDronContainer.js

@@ -14,7 +14,9 @@ import { GET_ARCTFT_TYPE_CD } from '../../../utility/CondeUtil';
 export const BasisDronContainer = props => {
   const dispatch = useDispatch();
   const history = useHistory();
-  const { joinList, joinListCount } = useSelector(state => state.groupState);
+  const { joinList, joinListCount, groupList, groupListCount } = useSelector(
+    state => state.groupState
+  );
   const { selectData } = useSelector(state => state.dronState);
   const { list, count } = useSelector(state => state.dronState);
   const { user } = useSelector(state => state.authState, shallowEqual);
@@ -133,9 +135,9 @@ export const BasisDronContainer = props => {
 
   useEffect(() => {
     handlerCancel();
-    if (selectData) {
+    // if (selectData) {
-      handlerDronSearch();
+    //   handlerDronSearch();
-    }
+    // }
   }, []);
 
   useEffect(() => {
@@ -144,12 +146,15 @@ export const BasisDronContainer = props => {
         ...params,
         cstmrSno: user?.cstmrSno
       });
-
+      if (user.authId === 'SUPER' || user.authId === 'ADMIN') {
-      dispatch(
+        dispatch(GroupActions.GROUP_LIST.request(user.cstmrSno));
-        GroupActions.JOIN_LIST.request({
+      } else {
-          cstmrSno: user?.cstmrSno
+        dispatch(
-        })
+          GroupActions.JOIN_LIST.request({
-      );
+            cstmrSno: user?.cstmrSno
+          })
+        );
+      }
     }
   }, [user]);
 
@@ -220,13 +225,23 @@ export const BasisDronContainer = props => {
       <div className='pal-card-box'>
         <Row>
           <Col sm='4'>
-            <BasisGroupDronGrid
+            {user ? (
-              data={joinList}
+              <>
-              title={'그룹'}
+                <BasisGroupDronGrid
-              columns={columns}
+                  {...(user?.authId === 'SUPER' || user?.authId === 'ADMIN'
-              count={joinListCount}
+                    ? { data: groupList }
-              pagination={false}
+                    : { data: joinList })}
-            />
+                  title={'그룹'}
+                  columns={columns}
+                  {...(user?.authId === 'SUPER' || user?.authId === 'ADMIN'
+                    ? { count: groupListCount }
+                    : { count: joinListCount })}
+                  pagination={false}
+                />
+              </>
+            ) : (
+              <></>
+            )}
           </Col>
           <Col sm='8'>
             {!selectData ? (