From 37c0ca54df46d109d8348223bc944d47edaf396b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Mon, 29 Aug 2022 13:13:35 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B6=8C=ED=95=9C=EC=84=A4=EC=A0=95=20?=
 =?UTF-8?q?=EC=9E=91=EC=97=85=EC=A4=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dbnt/faisp/authMgt/AuthMgtService.java    |  12 +
 .../faisp/authMgt/mapper/AuthMgtMapper.java   |   5 +
 .../faisp/authMgt/model/AccessConfig.java     |   7 +
 .../faisp/authMgt/model/ApprovalConfig.java   |   7 +
 .../faisp/controller/AuthMgtController.java   |  15 +-
 .../resources/mybatisMapper/AuthMgtMapper.xml |  21 ++
 .../adminPage/authMgt/authEditModal.html      | 218 +++++++-----------
 .../templates/adminPage/authMgt/authMgt.html  |   2 +-
 .../templates/adminPage/menuMgt/menuMgt.html  |  22 +-
 9 files changed, 150 insertions(+), 159 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/authMgt/AuthMgtService.java b/src/main/java/com/dbnt/faisp/authMgt/AuthMgtService.java
index c7034e27..ce702977 100644
--- a/src/main/java/com/dbnt/faisp/authMgt/AuthMgtService.java
+++ b/src/main/java/com/dbnt/faisp/authMgt/AuthMgtService.java
@@ -1,11 +1,16 @@
 package com.dbnt.faisp.authMgt;
 
 import com.dbnt.faisp.authMgt.mapper.AuthMgtMapper;
+import com.dbnt.faisp.authMgt.model.AccessConfig;
+import com.dbnt.faisp.authMgt.model.ApprovalConfig;
 import com.dbnt.faisp.authMgt.repository.AccessConfigRepository;
 import com.dbnt.faisp.authMgt.repository.ApprovalConfigRepository;
+import com.dbnt.faisp.userInfo.model.UserInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 
 @Service
 @RequiredArgsConstructor
@@ -15,4 +20,11 @@ public class AuthMgtService {
   private final ApprovalConfigRepository approvalConfigRepository;
 
 
+  public List<AccessConfig> selectAccessConfigList(UserInfo userInfo) {
+    return authMgtMapper.selectAccessConfigList(userInfo);
+  }
+
+  public List<ApprovalConfig> selectApprovalConfigList(UserInfo userInfo) {
+    return authMgtMapper.selectApprovalConfigList(userInfo);
+  }
 }
diff --git a/src/main/java/com/dbnt/faisp/authMgt/mapper/AuthMgtMapper.java b/src/main/java/com/dbnt/faisp/authMgt/mapper/AuthMgtMapper.java
index e036ec86..5853f840 100644
--- a/src/main/java/com/dbnt/faisp/authMgt/mapper/AuthMgtMapper.java
+++ b/src/main/java/com/dbnt/faisp/authMgt/mapper/AuthMgtMapper.java
@@ -1,6 +1,8 @@
 package com.dbnt.faisp.authMgt.mapper;
 
 import com.dbnt.faisp.authMgt.model.AccessConfig;
+import com.dbnt.faisp.authMgt.model.ApprovalConfig;
+import com.dbnt.faisp.userInfo.model.UserInfo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -8,4 +10,7 @@ import java.util.List;
 @Mapper
 public interface AuthMgtMapper {
 
+  List<AccessConfig> selectAccessConfigList(UserInfo userInfo);
+
+  List<ApprovalConfig> selectApprovalConfigList(UserInfo userInfo);
 }
diff --git a/src/main/java/com/dbnt/faisp/authMgt/model/AccessConfig.java b/src/main/java/com/dbnt/faisp/authMgt/model/AccessConfig.java
index a80b32a1..91244430 100644
--- a/src/main/java/com/dbnt/faisp/authMgt/model/AccessConfig.java
+++ b/src/main/java/com/dbnt/faisp/authMgt/model/AccessConfig.java
@@ -25,6 +25,13 @@ public class AccessConfig{
   @Column(name = "access_auth")
   private String accessAuth;
 
+  @Transient
+  private String cat1Cd;
+  @Transient
+  private String cat2Cd;
+  @Transient
+  private String cat3Cd;
+
   @Embeddable
   @Data
   @NoArgsConstructor
diff --git a/src/main/java/com/dbnt/faisp/authMgt/model/ApprovalConfig.java b/src/main/java/com/dbnt/faisp/authMgt/model/ApprovalConfig.java
index 7e6410f6..96f30841 100644
--- a/src/main/java/com/dbnt/faisp/authMgt/model/ApprovalConfig.java
+++ b/src/main/java/com/dbnt/faisp/authMgt/model/ApprovalConfig.java
@@ -25,6 +25,13 @@ public class ApprovalConfig {
   @Column(name = "approval_auth")
   private String approvalAuth;
 
+  @Transient
+  private String cat1Cd;
+  @Transient
+  private String cat2Cd;
+  @Transient
+  private String cat3Cd;
+
   @Embeddable
   @Data
   @NoArgsConstructor
diff --git a/src/main/java/com/dbnt/faisp/controller/AuthMgtController.java b/src/main/java/com/dbnt/faisp/controller/AuthMgtController.java
index e721281e..1c8dd5b2 100644
--- a/src/main/java/com/dbnt/faisp/controller/AuthMgtController.java
+++ b/src/main/java/com/dbnt/faisp/controller/AuthMgtController.java
@@ -1,15 +1,13 @@
 package com.dbnt.faisp.controller;
 
+import com.dbnt.faisp.authMgt.AuthMgtService;
 import com.dbnt.faisp.menuMgt.MenuMgtService;
-import com.dbnt.faisp.menuMgt.model.MenuMgt;
 import com.dbnt.faisp.userInfo.UserInfoService;
 import com.dbnt.faisp.userInfo.model.UserInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.util.List;
-
 
 @RestController
 @RequiredArgsConstructor
@@ -18,10 +16,11 @@ public class AuthMgtController {
 
   private final MenuMgtService menuMgtService;
   private final UserInfoService userInfoService;
+  private final AuthMgtService authMgtService;
 
   @GetMapping("/authMgtPage")
   public ModelAndView menuMgtPage(UserInfo userInfo) {
-    ModelAndView mav = new ModelAndView("/adminPage/authMgt/authMgt");
+    ModelAndView mav = new ModelAndView("adminPage/authMgt/authMgt");
     userInfo.setQueryInfo();
     mav.addObject("userInfoList", userInfoService.selectUserInfoList(userInfo));
     userInfo.setContentCnt(userInfoService.selectUserInfoListCnt(userInfo));
@@ -32,10 +31,10 @@ public class AuthMgtController {
   
   @GetMapping("/authEditModal")
   public ModelAndView menuEditModal(UserInfo userInfo){
-    ModelAndView mav = new ModelAndView("/adminPage/authMgt/authEditModal");
-    userInfo.setAccessConfigList(null);// 기능구현 예정
-    userInfo.setApprovalConfigList(null);// 기능구현 예정
-    mav.addObject(userInfo);
+    ModelAndView mav = new ModelAndView("adminPage/authMgt/authEditModal");
+    userInfo.setAccessConfigList(authMgtService.selectAccessConfigList(userInfo));
+    userInfo.setApprovalConfigList(authMgtService.selectApprovalConfigList(userInfo));
+    mav.addObject("userInfo", userInfo);
     return mav;
   }
 
diff --git a/src/main/resources/mybatisMapper/AuthMgtMapper.xml b/src/main/resources/mybatisMapper/AuthMgtMapper.xml
index 67da59ae..bb529ce8 100644
--- a/src/main/resources/mybatisMapper/AuthMgtMapper.xml
+++ b/src/main/resources/mybatisMapper/AuthMgtMapper.xml
@@ -4,5 +4,26 @@
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.dbnt.faisp.authMgt.mapper.AuthMgtMapper">
+  <select id="selectAccessConfigList" resultType="AccessConfig" parameterType="UserInfo">
+    select a.menu_key,
+           a.cat1_cd as cat1Cd,
+           a.cat2_cd as cat2Cd,
+           a.cat3_cd as cat3Cd,
+           b.access_auth
+    from menu_mgt a
+           left outer join access_config b
+                           on a.menu_key = b.menu_key and b.user_seq = #{userSeq}
+  </select>
 
+  <select id="selectApprovalConfigList" resultType="ApprovalConfig" parameterType="UserInfo">
+    select a.menu_key,
+           a.cat1_cd as cat1Cd,
+           a.cat2_cd as cat2Cd,
+           a.cat3_cd as cat3Cd,
+           b.approval_auth
+    from menu_mgt a
+           left outer join approval_config b
+                           on a.menu_key = b.menu_key and b.user_seq = #{userSeq}
+    where a.approval_chk = 'T'
+  </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/adminPage/authMgt/authEditModal.html b/src/main/resources/templates/adminPage/authMgt/authEditModal.html
index dd2e6d0a..ebb9d4c1 100644
--- a/src/main/resources/templates/adminPage/authMgt/authEditModal.html
+++ b/src/main/resources/templates/adminPage/authMgt/authEditModal.html
@@ -1,149 +1,89 @@
 <!DOCTYPE html>
 <html lang="ko" xmlns:th="http://www.thymeleaf.org">
-<!--<form id="authEditForm" action="#" method="post">-->
-  <!--<th:block th:if="${menuMgt.menuKey ne null}">
-    <input type="hidden" name="menuKey" id="menuKey" th:value="${menuMgt.menuKey}">
-  </th:block>-->
   <div class="tab-pane fade show active" id="accessTabPanel" role="tabpanel" aria-labelledby="accessTab" tabindex="0">
-    <table class="table table-hover">
-      <thead>
-      <tr>
-        <th>대분류</th>
-        <th>중분류</th>
-        <th>소분류</th>
-        <th>관리</th>
-        <th>작성</th>
-        <th>조회</th>
-      </tr>
-      </thead>
-      <tbody>
-      <tr>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-      </tr>
-      <tr>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-      </tr>
-      <tr>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-      </tr>
-      <tr>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-      </tr>
-      </tbody>
-    </table>
+    <form id="accessEditForm" action="#" method="post">
+      <table class="table table-hover text-center">
+        <thead>
+        <tr>
+          <th>대분류</th>
+          <th>중분류</th>
+          <th>소분류</th>
+          <th>관리</th>
+          <th>작성</th>
+          <th>조회</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr th:each="accessConfig:${userInfo.accessConfigList}">
+          <th:block th:each="commonCode:${session.commonCodeList}">
+            <th:block th:if="${commonCode.itemCd eq accessConfig.cat1Cd}">
+              <td th:text="${commonCode.itemValue}"></td>
+            </th:block>
+          </th:block>
+          <th:block th:each="commonCode:${session.commonCodeList}">
+            <th:block th:if="${commonCode.itemCd eq accessConfig.cat2Cd}">
+              <td th:text="${commonCode.itemValue}"></td>
+            </th:block>
+          </th:block>
+          <th:block th:if="${#strings.isEmpty(accessConfig.cat3Cd)}">
+            <td></td>
+          </th:block>
+          <th:block th:unless="${#strings.isEmpty(accessConfig.cat3Cd)}" th:each="commonCode:${session.commonCodeList}">
+            <th:block th:if="${commonCode.itemCd eq accessConfig.cat3Cd}">
+              <td th:text="${commonCode.itemValue}"></td>
+            </th:block>
+          </th:block>
+          <td>
+            <input type="radio" th:name="${#strings.concat('accessAuth',accessConfig.menuKey)}" th:checked="${'ACC003' eq accessConfig.accessAuth}" value="ACC003">
+          </td>
+          <td>
+            <input type="radio" th:name="${#strings.concat('accessAuth',accessConfig.menuKey)}" th:checked="${'ACC002' eq accessConfig.accessAuth}" value="ACC002">
+          </td>
+          <td>
+            <input type="radio" th:name="${#strings.concat('accessAuth',accessConfig.menuKey)}" th:checked="${'ACC001' eq accessConfig.accessAuth}" value="ACC001">
+          </td>
+        </tr>
+        </tbody>
+      </table>
+    </form>
   </div>
   <div class="tab-pane fade" id="approvalTabPanel" role="tabpanel" aria-labelledby="approvalTab" tabindex="0">
-    <table class="table table-hover">
-      <thead>
-      <tr>
-        <th>대분류</th>
-        <th>중분류</th>
-        <th>계장대행</th>
-        <th>계장</th>
-        <th>과장대행</th>
-        <th>과장</th>
-      </tr>
-      </thead>
-      <tbody>
-      <tr>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-      </tr>
-      <tr>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-      </tr>
-      <tr>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-      </tr>
-      <tr>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-        <td>.</td>
-      </tr>
-      </tbody>
-    </table>
-  </div>
-  <!--<div class="row mb-3">
-    <label for="cat1Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">대분류</label>
-    <div class="col-sm-6">
-      <select class="form-select form-select-sm" id="cat1Cd" name="cat1Cd">
-        <option value="">대분류 선택</option>
-        <th:block th:each="commonCode:${session.commonCodeList}">
-          <th:block th:if="${commonCode.categoryCd=='CAT1'}">
-            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd==menuMgt.cat1Cd}"></option>
+    <form id="approvalEditForm" action="#" method="post">
+      <table class="table table-hover text-center">
+        <thead>
+        <tr>
+          <th>대분류</th>
+          <th>중분류</th>
+          <th>계장대행</th>
+          <th>계장</th>
+          <th>과장대행</th>
+          <th>과장</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr th:each="approvalConfig:${userInfo.approvalConfigList}">
+          <th:block th:each="commonCode:${session.commonCodeList}">
+            <th:block th:if="${commonCode.itemCd eq approvalConfig.cat1Cd}">
+              <td th:text="${commonCode.itemValue}">.</td>
+            </th:block>
           </th:block>
-        </th:block>
-      </select>
-    </div>
-  </div>
-  <div class="row mb-3">
-    <label for="cat2Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">중분류</label>
-    <div class="col-sm-6">
-      <select class="form-select form-select-sm" id="cat2Cd" name="cat2Cd">
-        <option value="">중분류 선택</option>
-        <th:block th:each="commonCode:${session.commonCodeList}">
-          <th:block th:if="${commonCode.categoryCd=='CAT2'}">
-            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd==menuMgt.cat2Cd}"></option>
+          <th:block th:each="commonCode:${session.commonCodeList}">
+            <th:block th:if="${commonCode.itemCd eq approvalConfig.cat2Cd}">
+              <td th:text="${commonCode.itemValue}">.</td>
+            </th:block>
           </th:block>
-        </th:block>
-      </select>
-    </div>
-  </div>
-  <div class="row mb-3">
-    <label for="cat3Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">소분류</label>
-    <div class="col-sm-6">
-      <select class="form-select form-select-sm" id="cat3Cd" name="cat3Cd">
-        <option value="">소분류 선택</option>
-        <th:block th:each="commonCode:${session.commonCodeList}">
-          <th:block th:if="${commonCode.categoryCd=='CAT3'}">
-            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd==menuMgt.cat3Cd}"></option>
+          <th:block th:each="commonCode:${session.commonCodeList}">
+            <th:block th:if="${commonCode.itemCd eq approvalConfig.cat3Cd}">
+              <td th:text="${commonCode.itemValue}">.</td>
+            </th:block>
           </th:block>
-        </th:block>
-      </select>
-    </div>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+        </tbody>
+      </table>
+    </form>
   </div>
-  <div class="row mb-3">
-    <label for="menuUrl" class="col-sm-4 col-form-label col-form-label-sm text-center">URL</label>
-    <div class="col-sm-6">
-      <input type="text" class="form-control form-control-sm" id="menuUrl" name="menuUrl" th:value="${menuMgt.menuUrl}">
-    </div>
-  </div>-->
-<!--</form>-->
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/adminPage/authMgt/authMgt.html b/src/main/resources/templates/adminPage/authMgt/authMgt.html
index fed91c1a..0a61c68b 100644
--- a/src/main/resources/templates/adminPage/authMgt/authMgt.html
+++ b/src/main/resources/templates/adminPage/authMgt/authMgt.html
@@ -134,7 +134,7 @@
   </main>
 
   <div class="modal fade" id="authEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="authEditModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-lg">
+    <div class="modal-dialog modal-lg modal-dialog-scrollable">
       <div class="modal-content" id="authEditModalContent">
         <div class="modal-header">
           <h5 class="modal-title" id="menuEditModalLabel">권한 편집</h5>
diff --git a/src/main/resources/templates/adminPage/menuMgt/menuMgt.html b/src/main/resources/templates/adminPage/menuMgt/menuMgt.html
index e20d37b0..bbf78234 100644
--- a/src/main/resources/templates/adminPage/menuMgt/menuMgt.html
+++ b/src/main/resources/templates/adminPage/menuMgt/menuMgt.html
@@ -19,7 +19,7 @@
               <div class="col-auto">
                 <select class="form-select" name="rowCnt" id="rowCnt">
                   <th:block th:each="num : ${#numbers.sequence(1,5)}">
-                    <option th:value="${num*10}" th:text="${num*10}" th:selected="${searchParams.rowCnt==num*10}"></option>
+                    <option th:value="${num*10}" th:text="${num*10}" th:selected="${searchParams.rowCnt eq num*10}"></option>
                   </th:block>
                 </select>
               </div>
@@ -29,8 +29,8 @@
                     <select class="form-select form-select-sm" name="cat1Cd">
                       <option value="">대분류 선택</option>
                       <th:block th:each="commonCode:${session.commonCodeList}">
-                        <th:block th:if="${commonCode.categoryCd=='CAT1'}">
-                          <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${searchParams.cat1Cd==commonCode.itemCd}"></option>
+                        <th:block th:if="${commonCode.categoryCd eq 'CAT1'}">
+                          <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${searchParams.cat1Cd eq commonCode.itemCd}"></option>
                         </th:block>
                       </th:block>
                     </select>
@@ -39,8 +39,8 @@
                     <select class="form-select form-select-sm" name="cat2Cd">
                       <option value="">중분류 선택</option>
                       <th:block th:each="commonCode:${session.commonCodeList}">
-                        <th:block th:if="${commonCode.categoryCd=='CAT2'}">
-                          <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${searchParams.cat2Cd==commonCode.itemCd}"></option>
+                        <th:block th:if="${commonCode.categoryCd eq 'CAT2'}">
+                          <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${searchParams.cat2Cd eq commonCode.itemCd}"></option>
                         </th:block>
                       </th:block>
                     </select>
@@ -49,8 +49,8 @@
                     <select class="form-select form-select-sm" name="cat3Cd">
                       <option value="">소분류 선택</option>
                       <th:block th:each="commonCode:${session.commonCodeList}">
-                        <th:block th:if="${commonCode.categoryCd=='CAT3'}">
-                          <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${searchParams.cat3Cd==commonCode.itemCd}"></option>
+                        <th:block th:if="${commonCode.categoryCd eq 'CAT3'}">
+                          <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${searchParams.cat3Cd eq commonCode.itemCd}"></option>
                         </th:block>
                       </th:block>
                     </select>
@@ -89,17 +89,17 @@
                           <input type="checkbox" class="menuCheckBox" th:value="${menuMgt.menuKey}">
                         </td>
                         <th:block th:if="${menuMgt.cat1RowspanCnt ne 0}" th:each="commonCode:${session.commonCodeList}">
-                          <th:block th:if="${commonCode.itemCd == menuMgt.cat1Cd}">
+                          <th:block th:if="${commonCode.itemCd  eq  menuMgt.cat1Cd}">
                             <td th:text="${commonCode.itemValue}" th:rowspan="${menuMgt.cat1RowspanCnt}"></td>
                           </th:block>
                         </th:block>
                         <th:block th:if="${menuMgt.cat2RowspanCnt ne 0}" th:each="commonCode:${session.commonCodeList}">
-                          <th:block th:if="${commonCode.itemCd == menuMgt.cat2Cd}">
+                          <th:block th:if="${commonCode.itemCd  eq  menuMgt.cat2Cd}">
                             <td th:text="${commonCode.itemValue}" th:rowspan="${menuMgt.cat2RowspanCnt}"></td>
                           </th:block>
                         </th:block>
                         <th:block th:each="commonCode:${session.commonCodeList}">
-                          <th:block th:if="${commonCode.itemCd == menuMgt.cat3Cd}">
+                          <th:block th:if="${commonCode.itemCd  eq  menuMgt.cat3Cd}">
                             <td th:text="${commonCode.itemValue}"></td>
                           </th:block>
                         </th:block>
@@ -126,7 +126,7 @@
                             </li>
                           </th:block>
                           <th:block th:each="num : ${#numbers.sequence(searchParams.startNum, searchParams.endNum)}">
-                            <li class="page-item" th:data-pageindex="${num}" th:classappend="${searchParams.pageIndex==num?'active':''}">
+                            <li class="page-item" th:data-pageindex="${num}" th:classappend="${searchParams.pageIndex eq num?'active':''}">
                               <a class="page-link" href="#" th:text="${num}"></a>
                             </li>
                           </th:block>