diff --git a/src/containers/basis/dron/BasisDronContainer.js b/src/containers/basis/dron/BasisDronContainer.js index 7653396..a528bc4 100644 --- a/src/containers/basis/dron/BasisDronContainer.js +++ b/src/containers/basis/dron/BasisDronContainer.js @@ -81,6 +81,7 @@ export const BasisDronContainer = props => { // width: '100px', sortable: true, cell: row => { + // console.log(row); return selectData?.groupId === row?.groupId ? ( { row?.groupId, row?.groupNm, row?.groupAuthCd, + row?.myGroupAuthCd, row?.aprvlYn ) } @@ -152,13 +154,13 @@ export const BasisDronContainer = props => { // minWidth: '102px', sortable: true, cell: row => { - const [isHover, setIsHover] = useState(false); - const enter = () => { - setIsHover(true); - }; - const leave = () => { - setIsHover(false); - }; + // const [isHover, setIsHover] = useState(false); + // const enter = () => { + // setIsHover(true); + // }; + // const leave = () => { + // setIsHover(false); + // }; let mine = false; if (user.authId === 'SUPER') { @@ -246,19 +248,25 @@ export const BasisDronContainer = props => { const handlerPageChange = page => { dispatch(Actions.LIST.request({ groupId: groupId, page })); }; - const handlerDetail = (groupId, groupNm, groupAuthCd, aprvlYn) => { + const handlerDetail = (groupId, groupNm, groupAuthCd, myGroupAuthCd) => { dispatch(Actions.SELECT({ groupId: groupId, groupNm: groupNm })); setParams({ ...params, groupId: groupId, groupNm: groupNm }); - dispatch(Actions.LIST.request({ searchParams: { groupId: groupId, page: 1 } })); + dispatch( + Actions.LIST.request({ searchParams: { groupId: groupId, page: 1 } }) + ); let my = false; if (user.authId === 'SUPER') { my = true; - } else if (user.authId === 'ADMIN' || user.authId === 'USER') { + } else if (user.authId === 'ADMIN') { + if (myGroupAuthCd) { + my = true; + } + } else if (user.authId === 'USER') { if (groupAuthCd) { my = true; } diff --git a/src/containers/basis/group/BasisGroupUsersContainer.js b/src/containers/basis/group/BasisGroupUsersContainer.js index 5f2ee67..9f8a337 100644 --- a/src/containers/basis/group/BasisGroupUsersContainer.js +++ b/src/containers/basis/group/BasisGroupUsersContainer.js @@ -213,7 +213,7 @@ export const BasisGroupUsersContainer = props => { normal = true; } } else if (user.authId === 'ADMIN' || user.authId === 'USER') { - if (my?.myGrouopAuthCd === 'MASTER') { + if (my?.myGroupAuthCd === 'MASTER') { if (row?.groupAuthCd === 'MASTER') { master = true; leader = true; @@ -225,7 +225,7 @@ export const BasisGroupUsersContainer = props => { master = true; normal = true; } - } else if (my?.myGrouopAuthCd === 'LEADER') { + } else if (my?.myGroupAuthCd === 'LEADER') { if (row?.groupAuthCd === 'MASTER') { master = true; leader = true; @@ -238,7 +238,7 @@ export const BasisGroupUsersContainer = props => { master = true; normal = true; } - } else if (my?.myGrouopAuthCd === 'NORMAL' || !my.myGrouopAuthCd) { + } else if (my?.myGroupAuthCd === 'NORMAL' || !my.myGroupAuthCd) { //가입그룹에서 NORMAL / 미가입 그룹 master = true; leader = true;