[권한정리] - 승인, 사용자 관리

src/containers/basis/group/BasisGroupApprovalContainer.js

@@ -31,38 +31,38 @@ export const BasisGroupApprovalContainer = props => {
 
   const column = [
     {
-      name: '생성일시',
+      name: '그룹명',
-      selector: row => row?.createDt,
+      selector: row => row.groupNm,
+      minWidth: '102px',
       sortable: true,
       cell: row => {
-        return row?.createDt ? row.createDt : '-';
+        return row?.groupNm;
+        // return selectData;
       }
     },
     {
-      name: '가입일시',
+      name: '그룹 코드',
-      selector: row => row?.joinDt,
+      selector: row => row.groupId,
+      minWidth: '102px',
       sortable: true,
       cell: row => {
-        return row?.joinDt ? row.joinDt : '-';
+        return row?.groupId;
       }
     },
     {
-      name: '그룹명',
+      name: '생성일시',
-      selector: row => row.groupNm,
+      selector: row => row?.createDt,
-      minWidth: '102px',
       sortable: true,
       cell: row => {
-        return row?.groupNm;
+        return row?.createDt ? row.createDt : '-';
-        // return selectData;
       }
     },
     {
-      name: '그룹 코드',
+      name: '가입일시',
-      selector: row => row.groupId,
+      selector: row => row?.joinDt,
-      minWidth: '102px',
       sortable: true,
       cell: row => {
-        return row?.groupId;
+        return row?.joinDt ? row.joinDt : '-';
       }
     },
     {
@@ -266,8 +266,7 @@ export const BasisGroupApprovalContainer = props => {
               return prev;
             }
           });
-          console.log(my);
+          if (my.groupAuthCd === 'NORMAL') {
-          if (my?.groupAuthCd === 'NORMAL') {
             disa = true;
           } else if (!my.groupAuthCd) {
             disa = true;
@@ -284,30 +283,6 @@ export const BasisGroupApprovalContainer = props => {
           }
         }
 
-        // if (user.authId === 'ADMIN') {
-        //   const join = groupList?.find(prev => {
-        //     if (prev.cstmrSno === user.cstmrSno) {
-        //       return prev;
-        //     }
-        //   });
-
-        //   if (join) {
-        //     //내 그룹
-        //     if (join.groupAuthCd === 'NORMAL') {
-        //       disa = true;
-        //     }
-        //   } else {
-        //     //내 그룹 아녀
-        //     disa = true;
-        //   }
-        // } else if (user.authId === 'USER') {
-        //   if (joinList[i].groupId === row?.groupId) {
-        //     if (joinList[i].groupAuthCd === 'NORMAL') {
-        //       disa = true;
-        //     }
-        //   }
-        // }
-
         return row?.aprvlYn === 'N' ? (
           <Button.Ripple
             color='primary'

src/containers/basis/group/BasisGroupUsersContainer.js

@@ -50,37 +50,37 @@ export const BasisGroupUsersContainer = props => {
 
   const columns = [
     {
-      name: '생성일시',
+      name: '그룹명',
-      selector: row => row?.createDt,
+      selector: row => row.groupNm,
+      // minWidth: '102px',
       sortable: true,
       cell: row => {
-        return row?.createDt ? row.createDt : '-';
+        return row?.groupNm;
       }
     },
     {
-      name: '가입일시',
+      name: '그룹 코드',
-      selector: row => row?.joinDt,
+      selector: row => row.groupId,
+      // minWidth: '102px',
       sortable: true,
       cell: row => {
-        return row?.joinDt ? row.joinDt : '-';
+        return row?.groupId;
       }
     },
     {
-      name: '그룹명',
+      name: '생성일시',
-      selector: row => row.groupNm,
+      selector: row => row?.createDt,
-      // minWidth: '102px',
       sortable: true,
       cell: row => {
-        return row?.groupNm;
+        return row?.createDt ? row.createDt : '-';
       }
     },
     {
-      name: '그룹 코드',
+      name: '가입일시',
-      selector: row => row.groupId,
+      selector: row => row?.joinDt,
-      // minWidth: '102px',
       sortable: true,
       cell: row => {
-        return row?.groupId;
+        return row?.joinDt ? row.joinDt : '-';
       }
     },
     {
@@ -125,16 +125,15 @@ export const BasisGroupUsersContainer = props => {
         return row?.groupNm;
       }
     },
-
+    // {
-    {
+    //   name: '그룹 코드',
-      name: '그룹 코드',
+    //   selector: row => row.groupId,
-      selector: row => row.groupId,
+    //   // minWidth: '102px',
-      // minWidth: '102px',
+    //   sortable: true,
-      sortable: true,
+    //   cell: row => {
-      cell: row => {
+    //     return row?.groupId;
-        return row?.groupId;
+    //   }
-      }
+    // },
-    },
     {
       name: '사용자 명',
       selector: row => row.memberName,
@@ -182,48 +181,33 @@ export const BasisGroupUsersContainer = props => {
         let leader = false;
         let normal = false;
 
-        if (user.authId === 'ADMIN') {
+        let my = '';
-          //모든 그룹 조회 가능
+        if (groupList) {
-          const my = groupList?.find(prev => {
+          my = groupList?.find(prev => {
             if (prev.groupId === row?.groupId) {
               return prev;
             }
           });
-          // console.log(groupList);
+        } else if (joinList) {
-          if (my?.groupAuthCd === 'MASTER') {
+          my = joinList?.find(prev => {
-            if (row?.groupAuthCd === 'MASTER') {
+            if (prev.groupId === row?.groupId) {
-              //
+              return prev;
-            } else if (row?.groupAuthCd === 'LEADER') {
-              leader = true;
-            } else if (row?.groupAuthCd === 'NORMAL') {
-              master = true;
-              normal = true;
             }
-          } else if (my?.groupAuthCd === 'LEADER') {
+          });
+        }
+
+        if (user.authId === 'SUPER') {
           if (row?.groupAuthCd === 'MASTER') {
             master = true;
             leader = true;
             normal = true;
           } else if (row?.groupAuthCd === 'LEADER') {
-              master = true;
             leader = true;
           } else if (row?.groupAuthCd === 'NORMAL') {
             master = true;
             normal = true;
           }
-          } else if (my?.groupAuthCd === 'NORMAL') {
+        } else if (user.authId === 'ADMIN' || user.authId === 'USER') {
-            //아.. 내 그룹 아니면 권한 다 NORMAL로 임시부여했지..
-            master = true;
-            leader = true;
-            normal = true;
-          }
-        } else if (user.authId === 'USER') {
-          //본인 그룹 조회 가능
-          const my = joinList?.find(prev => {
-            if (prev.groupId === row?.groupId) {
-              return prev;
-            }
-          });
           if (my?.groupAuthCd === 'MASTER') {
             if (row?.groupAuthCd === 'LEADER') {
               leader = true;
@@ -244,6 +228,11 @@ export const BasisGroupUsersContainer = props => {
               master = true;
               normal = true;
             }
+          } else if (my?.groupAuthCd === 'NORMAL' || !my.groupAuthCd) {
+            //가입그룹에서 NORMAL / 미가입 그룹
+            master = true;
+            leader = true;
+            normal = true;
           }
         }
 
@@ -366,9 +355,6 @@ export const BasisGroupUsersContainer = props => {
       desc: '해당 사용자를 운영자 권한으로 변경 하시겠습니까?'
     });
 
-    if (user.authId === 'SUPER' || user.authId === 'ADMIN') {
-    }
-
     setSaveData({
       cstmrGroupSno: cstmrGroupSno,
       joinYn: 'Y',
@@ -403,6 +389,25 @@ export const BasisGroupUsersContainer = props => {
       desc: '해당 사용자에게 그룹장을 위임 하시겠습니까?'
     });
 
+    if (user.authId === 'SUPER') {
+      const master = userList.find(prev => {
+        if (prev.groupAuthCd === 'MASTER') {
+          return prev;
+        }
+      });
+      setSaveData([
+        {
+          cstmrGroupSno: row,
+          joinYn: 'Y',
+          groupAuthCd: 'MASTER'
+        },
+        {
+          cstmrGroupSno: master.cstmrGroupSno,
+          joinYn: 'Y',
+          groupAuthCd: 'NORMAL'
+        }
+      ]);
+    } else {
       setSaveData([
         {
           cstmrGroupSno: row,
@@ -415,6 +420,7 @@ export const BasisGroupUsersContainer = props => {
           groupAuthCd: 'NORMAL'
         }
       ]);
+    }
   };
 
   const handlerAuthSave = async () => {