From 44e1c056558dc97881ecbec10c5feb933e3d1d0f 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, 5 Sep 2022 14:57:58 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A4=91=EA=B0=84=EC=A0=80=EC=9E=A5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dbnt/faisp/controller/MenuMgtController.java |  5 +++++
 src/main/resources/application-dev.properties        |  2 +-
 .../templates/adminPage/menuMgt/menuEditModal.html   | 12 ++++++------
 .../templates/adminPage/userMgt/userMgt.html         |  4 ++--
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/controller/MenuMgtController.java b/src/main/java/com/dbnt/faisp/controller/MenuMgtController.java
index 338ea287..81a3ed9a 100644
--- a/src/main/java/com/dbnt/faisp/controller/MenuMgtController.java
+++ b/src/main/java/com/dbnt/faisp/controller/MenuMgtController.java
@@ -1,5 +1,6 @@
 package com.dbnt.faisp.controller;
 
+import com.dbnt.faisp.codeMgt.CodeMgtService;
 import com.dbnt.faisp.menuMgt.MenuMgtService;
 import com.dbnt.faisp.menuMgt.model.MenuMgt;
 import lombok.RequiredArgsConstructor;
@@ -15,6 +16,7 @@ import java.util.List;
 public class MenuMgtController {
 
   private final MenuMgtService menuMgtService;
+  private final CodeMgtService codeMgtService;
 
   @GetMapping("/menuMgtPage")
   public ModelAndView menuMgtPage(MenuMgt menuMgt) {
@@ -31,6 +33,9 @@ public class MenuMgtController {
   public ModelAndView menuEditModal(MenuMgt menuMgt){
     ModelAndView mav = new ModelAndView("/adminPage/menuMgt/menuEditModal");
     mav.addObject("menuMgt", menuMgt);
+    mav.addObject("cat1List", codeMgtService.selectCodeMgtList("CAT1"));
+    mav.addObject("cat2List", codeMgtService.selectCodeMgtList("CAT2"));
+    mav.addObject("cat3List", codeMgtService.selectCodeMgtList("CAT3"));
     return mav;
   }
 
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index afb38dfa..bf666445 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -1,7 +1,7 @@
 spring.devtools.livereload.enabled=true
 
 #file upload
-spring.servlet.multipart.location=C:\\kcgFileManager
+spring.servlet.multipart.location=C:\\faispUploadFiles
 spring.servlet.multipart.max-file-size=200MB
 spring.servlet.multipart.max-request-size=500MB
 
diff --git a/src/main/resources/templates/adminPage/menuMgt/menuEditModal.html b/src/main/resources/templates/adminPage/menuMgt/menuEditModal.html
index 5600ad3f..73fa5f37 100644
--- a/src/main/resources/templates/adminPage/menuMgt/menuEditModal.html
+++ b/src/main/resources/templates/adminPage/menuMgt/menuEditModal.html
@@ -15,8 +15,8 @@
       <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.commonCode.get('CAT1')}">
-            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd==menuMgt.cat1Cd}"></option>
+          <th:block th:each="cat1:${cat1List}">
+            <option th:value="${cat1.itemCd}" th:text="${cat1.itemValue}" th:selected="${cat1.itemCd==menuMgt.cat1Cd}"></option>
           </th:block>
         </select>
       </div>
@@ -26,8 +26,8 @@
       <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.commonCode.get('CAT2')}">
-            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd==menuMgt.cat2Cd}"></option>
+          <th:block th:each="cat2:${cat2List}">
+            <option th:value="${cat2.itemCd}" th:text="${cat2.itemValue}" th:selected="${cat2.itemCd==menuMgt.cat2Cd}"></option>
           </th:block>
         </select>
       </div>
@@ -37,8 +37,8 @@
       <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.commonCode.get('CAT3')}">
-            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd==menuMgt.cat3Cd}"></option>
+          <th:block th:each="cat3:${cat3List}">
+            <option th:value="${cat3.itemCd}" th:text="${cat3.itemValue}" th:selected="${cat3.itemCd==menuMgt.cat3Cd}"></option>
           </th:block>
         </select>
       </div>
diff --git a/src/main/resources/templates/adminPage/userMgt/userMgt.html b/src/main/resources/templates/adminPage/userMgt/userMgt.html
index b64dde8f..755b496a 100644
--- a/src/main/resources/templates/adminPage/userMgt/userMgt.html
+++ b/src/main/resources/templates/adminPage/userMgt/userMgt.html
@@ -96,12 +96,12 @@
                         <td>
                           <input type="checkbox" id="userChk" name="userChk" class="userInfoCheckBox" th:value="${userInfo.userSeq}">
                         </td>
-                        <th:block th:each="commonCode:${session.commonCodeList}">
+                        <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                           <th:block th:if="${commonCode.itemCd == userInfo.ogCd}">
                             <td th:text="${commonCode.itemValue}"></td>
                           </th:block>
                         </th:block>
-                        <th:block th:each="commonCode:${session.commonCodeList}">
+                        <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
                           <th:block th:if="${commonCode.itemCd == userInfo.ofcCd}">
                             <td th:text="${commonCode.itemValue}"></td>
                           </th:block>