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

---
 src/main/java/cokr/xit/fims/base/FimsUser.java     | 14 ++++++++++++++
 .../cokr/xit/fims/base/web/MainController.java     |  3 ++-
 .../cokr/xit/fims/base/web/UserController.java     | 12 ++++++++++++
 .../resources/sql/mapper/base/authority-mapper.xml |  2 +-
 .../resources/sql/mapper/base/syslog-mapper.xml    |  4 ++--
 src/main/resources/sql/mapper/base/user-mapper.xml |  8 ++++----
 .../WEB-INF/jsp/fims/user/user01010-main.jsp       |  2 ++
 src/main/webapp/WEB-INF/jsp/login.jsp              |  2 +-
 8 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/base/FimsUser.java b/src/main/java/cokr/xit/fims/base/FimsUser.java
index a9a2f090..120dc4ec 100644
--- a/src/main/java/cokr/xit/fims/base/FimsUser.java
+++ b/src/main/java/cokr/xit/fims/base/FimsUser.java
@@ -11,6 +11,20 @@ public class FimsUser extends GenericUser {
 		return "USR00";
 	}
 
+	@Override
+	public String getAccount() {
+		String account = super.getAccount();
+		return account != null ? account.toUpperCase() : null;
+	}
+
+	@Override
+	public void setAccount(String account) {
+		if(account != null) {
+			account = account.toUpperCase();
+		}
+		super.setAccount(account);
+	}
+
 	/**
 	 * 직위 이름
 	 */
diff --git a/src/main/java/cokr/xit/fims/base/web/MainController.java b/src/main/java/cokr/xit/fims/base/web/MainController.java
index bb204ec0..5e40db03 100644
--- a/src/main/java/cokr/xit/fims/base/web/MainController.java
+++ b/src/main/java/cokr/xit/fims/base/web/MainController.java
@@ -143,7 +143,7 @@ public class MainController extends cokr.xit.base.web.MainController {
 	@RequestMapping(name="회원가입", value="/signup.do")
 	public ModelAndView signup(FimsUser user) {
 		ModelAndView mav = new ModelAndView("jsonView");
-
+		user.setAccount(user.getAccount().toUpperCase());
 		boolean saved = userService.create(user);
 
 		if(user.getUserSeCd() != null && user.getUserSeCd().equals("21")) {
@@ -156,6 +156,7 @@ public class MainController extends cokr.xit.base.web.MainController {
 
 	@RequestMapping(name="중복 확인", value="/duplicate.do")
 	public ModelAndView isDuplicate(String account, String sggCd) {
+		account = account.toUpperCase();
 		FimsUser user = userService.getUser(account, sggCd);
 		return new ModelAndView("jsonView")
 			.addObject("duplicate", user != null);
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 d904e421..3fa26df6 100644
--- a/src/main/java/cokr/xit/fims/base/web/UserController.java
+++ b/src/main/java/cokr/xit/fims/base/web/UserController.java
@@ -77,6 +77,18 @@ public class UserController extends cokr.xit.base.user.web.UserController<FimsUs
 		return mav;
 	}
 
+	@Override
+	public ModelAndView create(FimsUser user) {
+		user.setAccount(user.getAccount().toUpperCase());
+		return super.create(user);
+	}
+
+	@Override
+	public ModelAndView isDuplicate(String account, String institute) {
+		account = account.toUpperCase();
+		return super.isDuplicate(account, institute);
+	}
+
 	@RequestMapping(name="내 정보 조회",value="/myInfo.do")
 	public ModelAndView myInfo() {
 		ModelAndView mav = new ModelAndView("jsonView");
diff --git a/src/main/resources/sql/mapper/base/authority-mapper.xml b/src/main/resources/sql/mapper/base/authority-mapper.xml
index 80ae652c..d434112d 100644
--- a/src/main/resources/sql/mapper/base/authority-mapper.xml
+++ b/src/main/resources/sql/mapper/base/authority-mapper.xml
@@ -159,7 +159,7 @@ SELECT A.AUTH_ID
 SELECT A.AUTH_ID
      , A.USER_ID
      , A.REG_DT
-     , B.USER_ACNT
+     , UPPER(B.USER_ACNT) AS USER_ACNT
      , B.USER_NM
      , B.ORG_ID
      , (SELECT SGG_NM FROM TB_SGG WHERE SGG_CD = B.ORG_ID) AS SGG_NM
diff --git a/src/main/resources/sql/mapper/base/syslog-mapper.xml b/src/main/resources/sql/mapper/base/syslog-mapper.xml
index 01aa7099..aabf5997 100644
--- a/src/main/resources/sql/mapper/base/syslog-mapper.xml
+++ b/src/main/resources/sql/mapper/base/syslog-mapper.xml
@@ -35,7 +35,7 @@ SELECT LOG_ID
      , DATA_NM
      , PSNL_INFO
      , A.USER_ID
-     , USER_ACNT
+     , UPPER(USER_ACNT) AS USER_ACNT
      , USER_NM
      , NSTT_CD
      , IP_ADDR
@@ -52,7 +52,7 @@ SELECT LOG_ID
 <if test="toDate != null">   AND LOG_ID &lt;= CONCAT(#{toDate}, LPAD(9, 16, '9'))</if>
 <if test="logTypes != null">   AND A.LOG_TYPE IN (<foreach collection="logTypes" item="logType" separator=",">#{logType}</foreach>)</if>
 <if test="userIDs != null">   AND USER_ID IN (<foreach collection="userIDs" item="userID" separator=",">#{userID}</foreach>)</if>
-<if test="userAccounts != null">   AND USER_ACNT IN (<foreach collection="userAccounts" item="userAccount" separator=",">#{userAccount}</foreach>)</if>
+<if test="userAccounts != null">   AND UPPER(USER_ACNT) IN (<foreach collection="userAccounts" item="userAccount" separator=",">UPPER(#{userAccount})</foreach>)</if>
 <if test="userName != null">   AND USER_NM LIKE CONCAT('%', #{userName}, '%')</if>
    AND A.LOG_TYPE = C.LOG_TYPE
 </where>
diff --git a/src/main/resources/sql/mapper/base/user-mapper.xml b/src/main/resources/sql/mapper/base/user-mapper.xml
index c27ee498..b8960ebe 100644
--- a/src/main/resources/sql/mapper/base/user-mapper.xml
+++ b/src/main/resources/sql/mapper/base/user-mapper.xml
@@ -39,7 +39,7 @@
 <sql id="selectUsers">
 <include refid="utility.paging-prefix" />
 SELECT A.USER_ID
-     , A.USER_ACNT
+     , UPPER(A.USER_ACNT) AS USER_ACNT
      , A.USER_NM
      , A.USER_SE_CD
      , GET_CODE_NM('CMN008', A.USER_SE_CD) AS USER_SE_NM
@@ -100,7 +100,7 @@ SELECT A.USER_ID
 <select id="getUser" parameterType="map" resultMap="userRow">
 /* 사용자 계정 가져오기(userMapper.getUser) */
 SELECT USER_ID
-     , USER_ACNT
+     , UPPER(USER_ACNT) AS USER_ACNT
      , USER_NM
      , USER_SE_CD
      , GET_CODE_NM('CMN008', USER_SE_CD) AS USER_SE_NM
@@ -134,7 +134,7 @@ SELECT USER_ID
   FROM TB_USER
 <where>
 <if test="userID != null">AND USER_ID = #{userID}</if>
-<if test="account != null">AND USER_ACNT = #{account}</if>
+<if test="account != null">AND UPPER(USER_ACNT) = UPPER(#{account})</if>
 <if test="institute != null">AND NSTT_CD = #{institute}</if>
 <if test="orgID != null">AND ORG_ID = #{orgID}</if>
 <if test="cntnSeCd != null">AND CNTN_SE_CD = #{cntnSeCd}</if>
@@ -184,7 +184,7 @@ INSERT INTO TB_USER (
      , #{deptCode}
      , #{cntnSeCd}
      , #{userSeCd}
-     , #{account}
+     , UPPER(#{account})
      , #{name}
      , #{password}
      , #{passwordHint}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/user/user01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/user/user01010-main.jsp
index cee90f0a..b80de924 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/user/user01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/user/user01010-main.jsp
@@ -310,6 +310,8 @@ function save(info){
 		info.userSeCd = "21";
 	}
 	
+	info.account = info.account.toUpperCase();
+	
 	ajax.post({
 		url:!create ? wctx.url("/user/updateMyInfo.do") : wctx.url("/signup.do"),
 		data:info,
diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp
index adb1c52c..43f6f303 100644
--- a/src/main/webapp/WEB-INF/jsp/login.jsp
+++ b/src/main/webapp/WEB-INF/jsp/login.jsp
@@ -127,7 +127,7 @@ function login() {
 	if (!$("#formAuthentication input,select").validInputs()) return;
 	
 	var params = {
-		account:$("#userId").val(),
+		account: $("#userId").val().toUpperCase(),
 		password:$("#password").val(),
 		orgID: $("#orgID").val(),
 		cntnSeCd: $("#cntnSeCd").val(),