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 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 () B LEFT OUTER JOIN - TB_FILE A ON FILE_ID LIKE CONCAT(THIS_DAY, '%') - ) T1, ( + FROM () B + LEFT OUTER JOIN TB_FILE A ON FILE_ID LIKE CONCAT(THIS_DAY, '%') + ) T1 + , ( 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 @@
- - + + + +
@@ -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); + } } - }); \ No newline at end of file