기초정보관리 - 그룹목록 column 변경

src/containers/basis/dron/BasisDronContainer.js

@@ -31,6 +31,22 @@ export const BasisDronContainer = props => {
   });
 
   const columns = [
+    {
+      name: '생성일시',
+      selector: row => row?.createDt,
+      sortable: true,
+      cell: row => {
+        return row?.createDt ? row.createDt : '-';
+      }
+    },
+    {
+      name: '가입일시',
+      selector: row => row?.joinDt,
+      sortable: true,
+      cell: row => {
+        return row?.joinDt ? row.joinDt : '-';
+      }
+    },
     {
       name: '그룹명',
       selector: row => row.groupNm,

src/containers/basis/group/BasisGroupApprovalContainer.js

@@ -28,7 +28,24 @@ export const BasisGroupApprovalContainer = props => {
     cstmrSno: user?.cstmrSno,
     aprvYn: ''
   });
+
   const column = [
+    {
+      name: '생성일시',
+      selector: row => row?.createDt,
+      sortable: true,
+      cell: row => {
+        return row?.createDt ? row.createDt : '-';
+      }
+    },
+    {
+      name: '가입일시',
+      selector: row => row?.joinDt,
+      sortable: true,
+      cell: row => {
+        return row?.joinDt ? row.joinDt : '-';
+      }
+    },
     {
       name: '그룹명',
       selector: row => row.groupNm,
@@ -239,7 +256,7 @@ export const BasisGroupApprovalContainer = props => {
       // selector: 'cntrlStDate',
       // minWidth: '102px',
       sortable: false,
-      cell: row => {
+      cell: (row, i) => {
         let disa = false;
 
         if (user.authId === 'ADMIN') {
@@ -249,8 +266,11 @@ export const BasisGroupApprovalContainer = props => {
               return prev;
             }
           });
+          console.log(my);
           if (my?.groupAuthCd === 'NORMAL') {
             disa = true;
+          } else if (!my.groupAuthCd) {
+            disa = true;
           }
         } else if (user.authId === 'USER') {
           //본인 그룹 조회 가능
@@ -264,6 +284,30 @@ 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

@@ -49,6 +49,22 @@ export const BasisGroupUsersContainer = props => {
   });
 
   const columns = [
+    {
+      name: '생성일시',
+      selector: row => row?.createDt,
+      sortable: true,
+      cell: row => {
+        return row?.createDt ? row.createDt : '-';
+      }
+    },
+    {
+      name: '가입일시',
+      selector: row => row?.joinDt,
+      sortable: true,
+      cell: row => {
+        return row?.joinDt ? row.joinDt : '-';
+      }
+    },
     {
       name: '그룹명',
       selector: row => row.groupNm,
@@ -173,6 +189,7 @@ export const BasisGroupUsersContainer = props => {
               return prev;
             }
           });
+          // console.log(groupList);
           if (my?.groupAuthCd === 'MASTER') {
             if (row?.groupAuthCd === 'MASTER') {
               //
@@ -475,7 +492,7 @@ export const BasisGroupUsersContainer = props => {
                 title={'사용자'}
                 columns={userColumns}
                 count={userCount}
-                pagination={false}
+                pagination={true}
                 paginationPerPage={10}
                 paginationRowsPerPageOptions={[10, 20, 30, 40]}
               />