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 instList = fimsOgdpBean.selectAllInstList(); - mav.addObject("instList", instList); + List 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 * AND USER_ID = #{userID} AND USER_ACNT = #{account} - AND NSTT_CD = #{institute} +AND NSTT_CD = #{institute} +AND ORG_ID = #{orgID} 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 @@
- - - + >${item.SGG_NM}
@@ -98,8 +98,8 @@ @@ -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(); } });