From c2e8cdc1444fcc78210a147e1a5f5a81b7a518ce Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Fri, 22 Dec 2023 10:04:32 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EA=B8=B0?=
 =?UTF-8?q?=EA=B4=80=20=ED=91=9C=EC=8B=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cokr/xit/fims/MainController.java    |   8 ++
 .../cokr/xit/fims/cmmn/dao/FactionMapper.java |   6 +
 .../sql/mapper/fims/cmmn/faction-mapper.xml   |  11 +-
 src/main/webapp/WEB-INF/jsp/login.jsp         | 110 ++++++++++--------
 4 files changed, 85 insertions(+), 50 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/MainController.java b/src/main/java/cokr/xit/fims/MainController.java
index b312252f..8024cd79 100644
--- a/src/main/java/cokr/xit/fims/MainController.java
+++ b/src/main/java/cokr/xit/fims/MainController.java
@@ -68,6 +68,14 @@ public class MainController extends AbstractController {
 			.addObject("duplicate", user != null);
 	}
 
+	@RequestMapping(name="기관 목록", value="/error/instList.do")
+	public ModelAndView instList(String account, String institute) {
+		List<DataObject> instList = factionMapper.selectAllInstList();
+		return new ModelAndView("jsonView")
+			.addObject("instList", instList);
+	}
+
+
 	@GetMapping(name="홈", value={"/", "/index.do"})
 	public ModelAndView mainPage() {
 		return new ModelAndView("index");
diff --git a/src/main/java/cokr/xit/fims/cmmn/dao/FactionMapper.java b/src/main/java/cokr/xit/fims/cmmn/dao/FactionMapper.java
index 3bf299bf..e8ff22a0 100644
--- a/src/main/java/cokr/xit/fims/cmmn/dao/FactionMapper.java
+++ b/src/main/java/cokr/xit/fims/cmmn/dao/FactionMapper.java
@@ -39,4 +39,10 @@ public interface FactionMapper extends AbstractMapper {
 	 * @return 시군구코드,시군구명,기관코드,기관명,부서코드,부서명
 	 */
 	DataObject selectFactionInfoOfUser(String userId);
+
+	/**모든 기관 목록을 반환한다.<br />
+	 * @param
+	 * @return 기관 목록
+	 */
+	List<DataObject> selectAllInstList();
 }
diff --git a/src/main/resources/sql/mapper/fims/cmmn/faction-mapper.xml b/src/main/resources/sql/mapper/fims/cmmn/faction-mapper.xml
index d9f43fbf..66a5c64b 100644
--- a/src/main/resources/sql/mapper/fims/cmmn/faction-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/cmmn/faction-mapper.xml
@@ -57,9 +57,6 @@ LEFT OUTER JOIN TB_DEPT B ON (A.INST_CD = B.INST_CD)
 	</otherwise>
 </choose>
 	
-
-
-
 </select>
 
 <select id="selectFactionInfoOfUser" parameterType="string" resultType="dataobject">
@@ -76,4 +73,12 @@ SELECT S.SGG_CD
  WHERE U.USER_ID = #{userId}
 </select>
 
+<select id="selectAllInstList" parameterType="string" resultType="dataobject">
+/* 모든 기관 조회(factionMapper.selectAllInstList) */
+SELECT INST_CD
+     , INST_NM
+  FROM TB_SGG
+ WHERE USE_YN = 'Y'
+</select>
+
 </mapper>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp
index 9d23ceb7..b6c07dda 100644
--- a/src/main/webapp/WEB-INF/jsp/login.jsp
+++ b/src/main/webapp/WEB-INF/jsp/login.jsp
@@ -54,9 +54,6 @@
 				<div class="input-group">
 					<select id="institute" name="institute" class="form-select mb-2" 
 					style="height:45px;width:100%;max-width:560px;">
-						<option value="4060000">파주시</option>
-						<option value="4050000">용인시</option>
-						<option value="3910000">평택시</option>
 						<option value="default">기본</option>
 					</select>
 				</div>
@@ -90,15 +87,13 @@
 <template id="selectInstDialogTemplate">
 	<select class="form-select form-control-sm" id="selectInst">
 		<option value="">선택</option>
-		<option value="4060000">파주시</option>
-		<option value="4050000">용인시</option>
-		<option value="3910000">평택시</option>
 	</select>
 </template>
 
 <jsp:include page="/WEB-INF/jsp/include/tail.jsp" />
 
 <script type="text/javascript">
+var INST_LIST = [];
 
 ${functions}
 
@@ -132,53 +127,74 @@ function login() {
 	});
 }
 
+/**
+ * 회원가입 팝업
+ */
+function fnOpenSignup(){
+	dialog.open({
+		id : "selectInstDialog",
+		title : "기관 선택",
+		content : document.getElementById("selectInstDialogTemplate").innerHTML,
+		size : "sm",
+		init : () => {
+			var options = "";
+			for(var i=0; i < INST_LIST.length; i++){
+				options += "<option value='"+INST_LIST[i].INST_CD+"'>"+INST_LIST[i].INST_NM+"</option>";
+			}
+			$("#selectInst").append(options);
+		},
+		onOK : () => {
+			if($("#selectInst").val() == ""){
+				alert("기관을 선택하세요.");
+				return;
+			}
+			
+			dialog.close("selectInstDialog");
+			window.open(wctx.url("/error/signupPage.do")+"?institute="+$("#selectInst").val(), 
+					"regAccount", 
+					"width=950, height=500");
+		},
+		onClose : () => {}
+	});
+
+}
+
+/**
+ * 아이디 찾기 팝업
+ */
+function fn_FindId(){
+	window.open(".do", "findId", {width: 500, height:300});
+}
+
+/**
+ * 비밀번호 찾기 팝업
+ */
+function fn_FindPw(){
+	window.open(".do", "findPw", {width: 500, height:330});
+}
+
+
 $(function(){
 	$("#formAuthentication input").onEnterPress(login);
 	if ($("#userId").val())
 		$("#password").focus();
+	
+	ajax.get({
+		url : wctx.url("/error/instList.do"),
+		data : { },
+		success : (resp) => {
+			INST_LIST = resp.instList;
+			
+			var options = "";
+			for(var i=0; i < INST_LIST.length; i++){
+				options += "<option value='"+INST_LIST[i].INST_CD+"'>"+INST_LIST[i].INST_NM+"</option>";
+			}
+			$("#institute").append(options);
+			$("#institute").val("4060000");
+		}
+	});
 });
 
-	/**
-	 * 회원가입 팝업
-	 */
-	function fnOpenSignup(){
-		dialog.open({
-			id : "selectInstDialog",
-			title : "기관 선택",
-			content : document.getElementById("selectInstDialogTemplate").innerHTML,
-			size : "sm",
-			init : () => {},
-			onOK : () => {
-				if($("#selectInst").val() == ""){
-					alert("기관을 선택하세요.");
-					return;
-				}
-				
-				dialog.close("selectInstDialog");
-				window.open(wctx.url("/error/signupPage.do")+"?institute="+$("#selectInst").val(), 
-						"regAccount", 
-						"width=950, height=500");
-			},
-			onClose : () => {}
-		});
-
-	}
-
-	/**
-	 * 아이디 찾기 팝업
-	 */
-	function fn_FindId(){
-		window.open(".do", "findId", {width: 500, height:300});
-	}
-
-	/**
-	 * 비밀번호 찾기 팝업
-	 */
-	function fn_FindPw(){
-		window.open(".do", "findPw", {width: 500, height:330});
-	}
-
-
 </script>
 </body>
 </html>