From 3107fc2a9d9054f31e624ce6858279f21fe711a3 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: Tue, 11 Oct 2022 17:59:34 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B6=8C=ED=95=9C=EC=A0=95=EB=A6=AC=20-=20?=
 =?UTF-8?q?=EA=B8=B0=EC=B2=B4=EA=B4=80=EB=A6=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basis/dron/BasisDronContainer.js          | 28 ++++++++++++-------
 .../basis/group/BasisGroupUsersContainer.js   |  6 ++--
 2 files changed, 21 insertions(+), 13 deletions(-)

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 ? (
           <Button.Ripple
             color='danger'
@@ -98,6 +99,7 @@ export const BasisDronContainer = props => {
                 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;