diff --git a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java index 053c3e3d..46af37f1 100644 --- a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java +++ b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java @@ -37,7 +37,7 @@ public class KwmsController { mav.addObject("userInfo", empInfo); mav.addObject("msg", "검색 결과가 없습니다."); }else{ - if(savedUser.getUserStatus().equals("USC004")){ + if(savedUser!=null && savedUser.getUserStatus().equals("USC004")){ userInfo.setUserSeq(savedUser.getUserSeq()); } mav.addObject("joinFlag", "T"); @@ -45,6 +45,7 @@ public class KwmsController { mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG")); mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC")); mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT")); + mav.addObject("dutyList", codeMgtService.selectCodeMgtList("DT")); mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC")); mav.addObject("seriesList", codeMgtService.selectCodeMgtList(userInfo.getOutturnCd())); mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG")); diff --git a/src/main/java/com/dbnt/faisp/main/menuMgt/MenuMgtController.java b/src/main/java/com/dbnt/faisp/main/menuMgt/MenuMgtController.java index 879700af..383cd3be 100644 --- a/src/main/java/com/dbnt/faisp/main/menuMgt/MenuMgtController.java +++ b/src/main/java/com/dbnt/faisp/main/menuMgt/MenuMgtController.java @@ -51,4 +51,10 @@ public class MenuMgtController { return ""; } + @GetMapping("/defaultMenuMgt") + public ModelAndView defaultMenuMgt(){ + ModelAndView mav = new ModelAndView(); + + return mav; + } } diff --git a/src/main/resources/static/js/login/login.js b/src/main/resources/static/js/login/login.js index fa6083f8..207e0af3 100644 --- a/src/main/resources/static/js/login/login.js +++ b/src/main/resources/static/js/login/login.js @@ -119,14 +119,16 @@ function valueCheck(){ alert("현관서전입일을 입력해주세요."); return false; } + const dutyCd = targetForm.find("#dutyCd").val(); + if(!dutyCd){ + alert("직책을 선택해주세요."); + return false; + } const seriesCd = targetForm.find("#seriesCd").val(); if(!seriesCd){ alert("직별을 선택해주세요."); return false; } - - - return true; } diff --git a/src/main/resources/templates/adminPage/userMgt/userEditModal.html b/src/main/resources/templates/adminPage/userMgt/userEditModal.html index 3b911061..34fda0cc 100644 --- a/src/main/resources/templates/adminPage/userMgt/userEditModal.html +++ b/src/main/resources/templates/adminPage/userMgt/userEditModal.html @@ -129,6 +129,19 @@ +
+ +
+ +
+
diff --git a/src/main/resources/templates/login/joinForm.html b/src/main/resources/templates/login/joinForm.html index 0c2dc07a..49fe4dcb 100644 --- a/src/main/resources/templates/login/joinForm.html +++ b/src/main/resources/templates/login/joinForm.html @@ -123,6 +123,17 @@
+
+ +
+ +
+