From 677957eb8b1d68b1cf3f218be811b086d5f549af Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Mon, 1 Jul 2024 15:26:10 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95(=EC=8B=9C=EA=B5=B0=EA=B5=AC=EC=BD=94=EB=93=9C+?=
 =?UTF-8?q?=EC=9C=A0=EC=A0=80=EC=95=84=EC=9D=B4=EB=94=94+=ED=8C=A8?=
 =?UTF-8?q?=EC=8A=A4=EC=9B=8C=EB=93=9C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cokr/xit/fims/MainController.java    |  4 ++--
 .../resources/sql/mapper/base/user-mapper.xml |  3 ++-
 src/main/webapp/WEB-INF/jsp/login.jsp         | 24 +++++++++----------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/MainController.java b/src/main/java/cokr/xit/fims/MainController.java
index e9cf06bf..957af3c8 100644
--- a/src/main/java/cokr/xit/fims/MainController.java
+++ b/src/main/java/cokr/xit/fims/MainController.java
@@ -32,8 +32,8 @@ public class MainController extends cokr.xit.base.web.MainController {
 	@Override
 	public ModelAndView loginPage() {
         ModelAndView mav = new ModelAndView("login");
-        List<DataObject> instList = fimsOgdpBean.selectAllInstList();
-        mav.addObject("instList", instList);
+        List<DataObject> sggList = fimsOgdpBean.selectAllSggList();
+        mav.addObject("sggList", sggList);
         return mav;
 	}
 
diff --git a/src/main/resources/sql/mapper/base/user-mapper.xml b/src/main/resources/sql/mapper/base/user-mapper.xml
index 32ad53b3..c04e3783 100644
--- a/src/main/resources/sql/mapper/base/user-mapper.xml
+++ b/src/main/resources/sql/mapper/base/user-mapper.xml
@@ -109,7 +109,8 @@ SELECT *
 <where>
 <if test="userID != null">AND USER_ID = #{userID}</if>
 <if test="account != null">AND USER_ACNT = #{account}</if>
-<if test="institute != null">   AND NSTT_CD = #{institute}</if>
+<if test="institute != null">AND NSTT_CD = #{institute}</if>
+<if test="orgID != null">AND ORG_ID = #{orgID}</if>
 </where>
 </select>
 
diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp
index 179b40f5..cb91be13 100644
--- a/src/main/webapp/WEB-INF/jsp/login.jsp
+++ b/src/main/webapp/WEB-INF/jsp/login.jsp
@@ -54,13 +54,13 @@
 		<form id="formAuthentication" method="post">
 			<div class="input_wrap">
 				<div class="input-group">
-					<select id="institute" name="institute" required title="기관명" class="form-select mb-2 h-px-40 no-max-w">
+					<select id="orgID" name="orgID" required title="시군구명" class="form-select mb-2 h-px-40 no-max-w">
 						<option value="">[기관 선택]</option>
 						<option value="default">시스템관리</option>
-						<c:forEach items="${instList}" var="item">
-							<option value="${item.INST_CD}"
+						<c:forEach items="${sggList}" var="item">
+							<option value="${item.SGG_CD}"
 							<c:if test="${item.USER_USE_YN == 'N'}"> disabled </c:if>
-							>${item.INST_NM}</option>
+							>${item.SGG_NM}</option>
 						</c:forEach>
 					</select>
 				</div>
@@ -98,8 +98,8 @@
 <template id="selectInstDialogTemplate">
 	<select class="form-select form-control-sm" id="selectInst">
 		<option value="">선택</option>
-		<c:forEach items="${instList}" var="item">
-			<option value="${item.INST_CD}">${item.INST_NM}</option>
+		<c:forEach items="${sggList}" var="item">
+			<option value="${item.SGG_CD}">${item.SGG_NM}</option>
 		</c:forEach>
 	</select>
 </template>
@@ -116,7 +116,7 @@ function login() {
 	var params = {
 		account:$("#userId").val(),
 		password:$("#password").val(),
-		institute:$("#institute").val(),
+		orgID: $("#orgID").val(),
 		rememberCredentials: $("#remember").prop("checked")
 	};
 	
@@ -214,7 +214,7 @@ $(function(){
 	$("#formAuthentication input").onEnterPress(login);
 	
 	let sysInst = "<%= systemInst %>";
-	let cookieInst = "${cookie['userInstitute'].getValue()}";
+	let cookieOrg = "${cookie['userInstitute'].getValue()}";
 	let cookieUserId = "${cookie['userAccount'].getValue()}";
 	let hasCookie = (cookieInst != "" && cookieUserId != "");
 	let selectValue = "";
@@ -222,9 +222,9 @@ $(function(){
 
 	if(hasCookie){
 		selectValue = cookieInst;
-		isSelectable = $("#institute option[value='"+selectValue+"']").not("[disabled]").length;
+		isSelectable = $("#orgID option[value='"+selectValue+"']").not("[disabled]").length;
 		if(isSelectable){
-			$("#institute").val(cookieInst);
+			$("#orgID").val(cookieOrg);
 			$("#userId").val(cookieUserId);
 			$("#remember").prop("checked", true);
 			$("#password").focus();
@@ -235,10 +235,10 @@ $(function(){
 	selectValue = sysInst;
 	isSelectable = $("#institute option[value='"+selectValue+"']").not("[disabled]").length;
 	if(isSelectable){
-		$("#institute").val(selectValue);
+		$("#orgID").val(selectValue);
 		$("#userId").focus();
 	} else {
-		$("#institute").focus();
+		$("#orgID").focus();
 	}
 	
 });