From 9309e49d1ee614a580340a3ca7b2d4786c113d5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Wed, 5 Oct 2022 15:47:57 +0900 Subject: [PATCH] =?UTF-8?q?[api=EA=BC=AC=EC=9E=84=20=EC=88=98=EC=A0=95]?= =?UTF-8?q?=EA=B8=B0=EC=B2=B4=EB=AA=A9=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basis/dron/BasisDronContainer.js | 49 ++++++++++++------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/src/containers/basis/dron/BasisDronContainer.js b/src/containers/basis/dron/BasisDronContainer.js index 18e4050..d5e51e1 100644 --- a/src/containers/basis/dron/BasisDronContainer.js +++ b/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) { - handlerDronSearch(); - } + // if (selectData) { + // handlerDronSearch(); + // } }, []); useEffect(() => { @@ -144,12 +146,15 @@ export const BasisDronContainer = props => { ...params, cstmrSno: user?.cstmrSno }); - - dispatch( - GroupActions.JOIN_LIST.request({ - cstmrSno: user?.cstmrSno - }) - ); + if (user.authId === 'SUPER' || user.authId === 'ADMIN') { + dispatch(GroupActions.GROUP_LIST.request(user.cstmrSno)); + } else { + dispatch( + GroupActions.JOIN_LIST.request({ + cstmrSno: user?.cstmrSno + }) + ); + } } }, [user]); @@ -220,13 +225,23 @@ export const BasisDronContainer = props => {
- + {user ? ( + <> + + + ) : ( + <> + )} {!selectData ? (