From 094433f9f52e9030e33d85027b8d991d8464eeb9 Mon Sep 17 00:00:00 2001
From: TaehunPark <qkrxogns21@gmail.com>
Date: Mon, 29 Aug 2022 13:08:30 +0900
Subject: [PATCH] =?UTF-8?q?feat:=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?=
 =?UTF-8?q?=EA=B4=80=EC=84=9C,=EB=B6=80=EC=84=9C=EC=9E=85=EB=A0=A5?=
 =?UTF-8?q?=EB=9E=80=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/dbnt/faisp/codeMgt/CodeMgtService.java  | 2 +-
 .../java/com/dbnt/faisp/controller/BaseController.java    | 8 +++-----
 src/main/resources/static/js/login/login.js               | 2 +-
 src/main/resources/templates/login/login.html             | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

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<CodeMgt> selectCodeMgtOgList() {
-	return codeMgtRepository.findByCategoryCdOrderByItemCdAsc("OG");
+	return codeMgtRepository.findByCategoryCdOrderByItemCdAsc("OG"); 
 }
 
 public List<CodeMgt> 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<CodeMgt> code = codeMgtService.selectCodeMgtOgList();
-    List<CodeMgt> 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 @@
               	<option value="">--선택--</option>
               	<option th:each="val : ${OgList}" th:value="${val?.itemCd}" th:utext="${val?.itemValue}">
               	</option>
-              </select>
+              </select> 
             </div>
             <label for="ofcCd" class="col-sm-2 col-form-label text-center">부서</label>
             <div class="col-sm-4">