diff --git a/src/main/java/cokr/xit/fims/base/web/LoggingController.java b/src/main/java/cokr/xit/fims/base/web/LoggingController.java index 158d8707..4b601efa 100644 --- a/src/main/java/cokr/xit/fims/base/web/LoggingController.java +++ b/src/main/java/cokr/xit/fims/base/web/LoggingController.java @@ -32,6 +32,16 @@ public class LoggingController extends cokr.xit.base.syslog.web.LoggingControlle @Override public ModelAndView getLogs(LogQuery req) { + + if(req.getUserAccounts() != null && req.getUserAccounts().length > 0 + && req.getUserAccounts()[0] != null) { + String[] userAccounts = req.getUserAccounts(); + for(int i=0; i < userAccounts.length ; i++) { + userAccounts[i] = userAccounts[i].toUpperCase(); + } + req.setUserAccounts(userAccounts); + } + boolean download = !isEmpty(req.getDownload()); if (!download) setFetchSize(req); diff --git a/src/main/java/cokr/xit/fims/base/web/UserController.java b/src/main/java/cokr/xit/fims/base/web/UserController.java index 3fa26df6..15ec069d 100644 --- a/src/main/java/cokr/xit/fims/base/web/UserController.java +++ b/src/main/java/cokr/xit/fims/base/web/UserController.java @@ -16,6 +16,7 @@ import cokr.xit.base.code.service.CodeService; import cokr.xit.base.code.service.bean.CodeBean; import cokr.xit.base.security.SecuredUserInfo; import cokr.xit.base.security.access.service.AuthorityService; +import cokr.xit.base.user.UserQuery; import cokr.xit.base.user.service.UserService; import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.base.service.bean.OgdpBean; @@ -89,6 +90,14 @@ public class UserController extends cokr.xit.base.user.web.UserController ) B ON A.NSTT_CD = B.INST_CD AND A.DEPT_CD = B.DEPT_CD - AND ${by} LIKE CONCAT('%', #{term}, '%') + + + + AND ${by} LIKE CONCAT('%', UPPER(#{term}), '%') + + + AND ${by} LIKE CONCAT('%', #{term}, '%') + + + USER_ID IN (#{userID}) AND STTS != 'D' AND STTS = #{status} diff --git a/src/main/webapp/WEB-INF/jsp/base/syslog/syslog-main.jsp b/src/main/webapp/WEB-INF/jsp/base/syslog/syslog-main.jsp index 08060e24..192f7000 100644 --- a/src/main/webapp/WEB-INF/jsp/base/syslog/syslog-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/base/syslog/syslog-main.jsp @@ -98,7 +98,7 @@ function search${infoPrefix}s() { if (terms) { switch ($("#${infoPrefix}-query [name='by']").val()) { case "userName": params.userName = terms; break; - case "userAccount": params.userAccounts = [terms]; break; + case "userAccount": params.userAccounts = [terms.toUpperCase()]; break; case "userID": params.userIDs = [terms]; break; default: break; } diff --git a/src/main/webapp/WEB-INF/jsp/base/user/user-main.jsp b/src/main/webapp/WEB-INF/jsp/base/user/user-main.jsp index 6adb6b04..9ba4e34f 100644 --- a/src/main/webapp/WEB-INF/jsp/base/user/user-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/base/user/user-main.jsp @@ -71,9 +71,14 @@ var ${infoPrefix}Control = new UserControl(); function search${infoPrefix}s() { ${infoPrefix}Control.query = { - by:$("#${infoPrefix}-query [name='by']").val(), - term:$("#${infoPrefix}-query [name='term']").val() + by: $("#${infoPrefix}-query [name='by']").val(), + term: $("#${infoPrefix}-query [name='term']").val() }; + + if(${infoPrefix}Control.query.by == "userAccount"){ + ${infoPrefix}Control.query.term = ${infoPrefix}Control.query.term.toUpperCase(); + } + ${infoPrefix}Control.load(1); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/user/user02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/user/user02010-main.jsp index c42d983d..8f1d4be2 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/user/user02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/user/user02010-main.jsp @@ -236,6 +236,10 @@ $P.fnSearchList = () => { // 검색조건 $P.control.query = $P.formFields.get(); // 검색 조건 + if($P.control.query.by == "userAccount"){ + $P.control.query.term = $P.control.query.term.toUpperCase(); + } + $P.control.query.fetchSize = $P.control.defaultFetchSize; // 한번에 조회되는 자료 건수 $P.control.query.useYn = "Y"; // 사용 여부