diff --git a/src/main/java/com/dbnt/faisp/codeMgt/CodeMgtService.java b/src/main/java/com/dbnt/faisp/codeMgt/CodeMgtService.java index c086eee8..fa11f264 100644 --- a/src/main/java/com/dbnt/faisp/codeMgt/CodeMgtService.java +++ b/src/main/java/com/dbnt/faisp/codeMgt/CodeMgtService.java @@ -45,7 +45,7 @@ public class CodeMgtService{ } public List selectCodeMgtOgList() { - return codeMgtRepository.findByCategoryCdOrderByItemCdAsc("OG"); + return codeMgtRepository.findByCategoryCdOrderByItemCdAsc("OG"); } public List selectCodeMgtOfcList() { diff --git a/src/main/java/com/dbnt/faisp/controller/BaseController.java b/src/main/java/com/dbnt/faisp/controller/BaseController.java index b466ad31..ee739642 100644 --- a/src/main/java/com/dbnt/faisp/controller/BaseController.java +++ b/src/main/java/com/dbnt/faisp/controller/BaseController.java @@ -39,20 +39,18 @@ public class BaseController { } @GetMapping("/login") - public ModelAndView goLogin() { + public ModelAndView goLogin() { ModelAndView mav = new ModelAndView("/login/login"); - List code = codeMgtService.selectCodeMgtOgList(); - List ccode = codeMgtService.selectCodeMgtOfcList(); mav.addObject("OgList", codeMgtService.selectCodeMgtOgList()); mav.addObject("OfcList", codeMgtService.selectCodeMgtOfcList()); - System.out.println("@@"+code); - System.out.println("@@@"+ccode); return mav; } @GetMapping("/login-error") public ModelAndView loginError() { ModelAndView mav = new ModelAndView("/login/login"); + mav.addObject("OgList", codeMgtService.selectCodeMgtOgList()); + mav.addObject("OfcList", codeMgtService.selectCodeMgtOfcList()); mav.addObject("loginError", true); return mav; } diff --git a/src/main/resources/static/js/login/login.js b/src/main/resources/static/js/login/login.js index ef3982f2..d6c1350a 100644 --- a/src/main/resources/static/js/login/login.js +++ b/src/main/resources/static/js/login/login.js @@ -71,7 +71,7 @@ function valueCheck(form){ }else{ if(password.val() !== passwordConfirm.val()){ alert("비밀번호가 같지 않습니다."); - returnFlag = false; + returnFlag = false; } } } diff --git a/src/main/resources/templates/login/login.html b/src/main/resources/templates/login/login.html index 2ab67a25..638b445a 100644 --- a/src/main/resources/templates/login/login.html +++ b/src/main/resources/templates/login/login.html @@ -104,7 +104,7 @@ - +