From a2da85fb48e33bd47f63f2912a3f4835ea158abf Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Mon, 1 Jul 2024 14:28:42 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A1=A4=EB=B0=B1=20=EC=86=8C=EC=8A=A4=20?=
 =?UTF-8?q?=EC=9D=BC=EB=B6=80=20=EB=B3=B5=EA=B5=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cokr/xit/fims/FimsApplication.java   |  3 +-
 .../java/cokr/xit/fims/MainController.java    |  5 ++-
 .../resources/sql/mapper/base/file-mapper.xml |  7 ++--
 .../WEB-INF/jsp/fims/mngt/mngt04020-info.jsp  | 40 ++++++++++++++++---
 4 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/FimsApplication.java b/src/main/java/cokr/xit/fims/FimsApplication.java
index f8eff42c..bfe7618f 100644
--- a/src/main/java/cokr/xit/fims/FimsApplication.java
+++ b/src/main/java/cokr/xit/fims/FimsApplication.java
@@ -4,6 +4,7 @@ import org.springframework.boot.Banner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.context.ApplicationPidFileWriter;
 import org.springframework.context.annotation.ImportResource;
 
 import cokr.xit.base.ServletCustomizer;
@@ -33,7 +34,7 @@ public class FimsApplication extends XitBaseApplication {
 		application.setBannerMode(Banner.Mode.OFF);
 		application.setLogStartupInfo(false);
 
-		//application.addListeners(new ApplicationPidFileWriter("fims.pid"));
+		application.addListeners(new ApplicationPidFileWriter("fims.pid"));
 		application.run(args);
 	}
 
diff --git a/src/main/java/cokr/xit/fims/MainController.java b/src/main/java/cokr/xit/fims/MainController.java
index 4fbd4cef..e9cf06bf 100644
--- a/src/main/java/cokr/xit/fims/MainController.java
+++ b/src/main/java/cokr/xit/fims/MainController.java
@@ -31,7 +31,10 @@ public class MainController extends cokr.xit.base.web.MainController {
 
 	@Override
 	public ModelAndView loginPage() {
-		return new ModelAndView("login");
+        ModelAndView mav = new ModelAndView("login");
+        List<DataObject> instList = fimsOgdpBean.selectAllInstList();
+        mav.addObject("instList", instList);
+        return mav;
 	}
 
 	@Override
diff --git a/src/main/resources/sql/mapper/base/file-mapper.xml b/src/main/resources/sql/mapper/base/file-mapper.xml
index 485974dd..2624f7e4 100644
--- a/src/main/resources/sql/mapper/base/file-mapper.xml
+++ b/src/main/resources/sql/mapper/base/file-mapper.xml
@@ -102,9 +102,10 @@ SELECT NEW_ID
      , CONCAT(DIR, NEW_ID, '.', #{file.extension}) PATH
   FROM (
        SELECT NVL(MAX(FILE_ID) + 1, CONCAT(THIS_DAY, '00001')) NEW_ID
-         FROM (<include refid="utility.selectThisDay" />) B LEFT OUTER JOIN
-              TB_FILE A ON FILE_ID LIKE CONCAT(THIS_DAY, '%')
-       ) T1, (
+         FROM (<include refid="utility.selectThisDay" />) B 
+         LEFT OUTER JOIN TB_FILE A ON FILE_ID LIKE CONCAT(THIS_DAY, '%')
+       ) T1
+       , (
        <include refid="fileDirs" />
         WHERE INF_TYPE = #{file.infoType}
        ) T2
diff --git a/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04020-info.jsp
index 63f9fb3f..ae6255d9 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04020-info.jsp
@@ -6,9 +6,32 @@
 	
 		<div class="card">
 			<form id="frmEdit--${pageName}" name="frmEdit">
-				<input type="text" id="sggID--${pageName}" name="sggID" data-map="SGG_CD" hidden />
-				<input type="text" id="instCode--${pageName}" name="instCode" data-map="INST_CD" hidden />
 				
+				<div class="row g-1" id="forRootAdmin--${pageName}" hidden>
+					<div class="col-md-6">
+						<label for="sggID--${pageName}"
+						class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end required">
+						시군구코드
+						</label>
+						
+						<input type="text" id="sggID--${pageName}" name="sggID" data-map="SGG_CD"
+						class="form-control" required maxlength="7" />
+						
+					</div>
+					<div class="col-md-6">
+						<label for="instCode--${pageName}"
+						class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end required">
+						기관코드
+						</label>
+						
+						<input type="text" id="instCode--${pageName}" name="instCode" data-map="INST_CD"
+						class="form-control" required maxlength="7" />
+						
+					</div>
+				</div>
+					
+
+
 				<div class="row g-1">
 					
 					<div class="col-md-6">
@@ -197,6 +220,11 @@ $(document).ready(function(){
 	/**************************************************************************
 	 * 초기화
 	 **************************************************************************/
+	
+	if(MY_INFO.institute == 'default') {
+		$("#forRootAdmin--${pageName}").removeAttr("hidden");
+	}
+	
 	var deptInfo = ${deptInfo};
 	if(deptInfo != null){
 		$("#deptID--${pageName}").attr("disabled","disabled");
@@ -207,10 +235,12 @@ $(document).ready(function(){
 		}
 	} else {
 		$P.deptControl.dataset.setData([]);
-		$("#sggID--${pageName}").val(MY_INFO.info.sggCd);
-		$("#instCode--${pageName}").val(MY_INFO.info.instCd);
+		
+		if(MY_INFO.institute != 'default') {
+			$("#sggID--${pageName}").val(MY_INFO.info.sggCd);
+			$("#instCode--${pageName}").val(MY_INFO.info.instCd);
+		}
 	}
-	
 });
 
 </script>
\ No newline at end of file