From 44fae4480a102058e302128855e23d5b82415bac Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Fri, 12 Jul 2024 14:13:03 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=EA=B3=84=EC=A0=95?=
 =?UTF-8?q?=20=EC=A1=B0=ED=9A=8C=EC=8B=9C=20=ED=8C=8C=EB=9D=BC=EB=AF=B8?=
 =?UTF-8?q?=ED=84=B0=20=EB=8C=80=EB=AC=B8=EC=9E=90=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cokr/xit/fims/base/web/LoggingController.java     | 10 ++++++++++
 .../java/cokr/xit/fims/base/web/UserController.java   |  9 +++++++++
 src/main/resources/sql/mapper/base/user-mapper.xml    | 11 ++++++++++-
 .../webapp/WEB-INF/jsp/base/syslog/syslog-main.jsp    |  2 +-
 src/main/webapp/WEB-INF/jsp/base/user/user-main.jsp   |  9 +++++++--
 .../webapp/WEB-INF/jsp/fims/user/user02010-main.jsp   |  4 ++++
 6 files changed, 41 insertions(+), 4 deletions(-)

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<FimsUs
 		return super.isDuplicate(account, institute);
 	}
 
+	@Override
+	public ModelAndView getUserList(UserQuery req) {
+		if(req.getBy() != null && req.getTerm() != null && req.getBy().equals("userAccount")) {
+			req.setTerm(req.getTerm().toUpperCase());
+		}
+		return super.getUserList(req);
+	}
+
 	@RequestMapping(name="내 정보 조회",value="/myInfo.do")
 	public ModelAndView myInfo() {
 		ModelAndView mav = new ModelAndView("jsonView");
diff --git a/src/main/resources/sql/mapper/base/user-mapper.xml b/src/main/resources/sql/mapper/base/user-mapper.xml
index b8960ebe..476bab7d 100644
--- a/src/main/resources/sql/mapper/base/user-mapper.xml
+++ b/src/main/resources/sql/mapper/base/user-mapper.xml
@@ -80,7 +80,16 @@ SELECT A.USER_ID
   <include refid="cokr.xit.base.user.dao.DepartmentMapper.adminSggDept" />
   ) B ON A.NSTT_CD = B.INST_CD AND A.DEPT_CD = B.DEPT_CD 
 <where>
-	<if test="by != null and term != null">AND ${by} LIKE CONCAT('%', #{term}, '%')</if>
+	<if test="by != null and term != null">
+		<choose>
+			<when test="by == 'userAccount'">
+	AND ${by} LIKE CONCAT('%', UPPER(#{term}), '%')
+			</when>
+			<otherwise>
+	AND ${by} LIKE CONCAT('%', #{term}, '%')
+			</otherwise>
+		</choose>
+	</if>
 	<if test="userIDs != null">USER_ID IN (<foreach collection="userIDs" item="userID" separator=",">#{userID}</foreach>)</if>
     <if test="status == null and userIDs == null">AND STTS != 'D'</if>
 	<if test="status != null">AND STTS = #{status}</if>
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";										// 사용 여부