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 @@
@@ -26,8 +26,8 @@
@@ -37,8 +37,8 @@
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 @@ - + - +