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 AND LOG_ID <= CONCAT(#{toDate}, LPAD(9, 16, '9')) AND A.LOG_TYPE IN (#{logType}) AND USER_ID IN (#{userID}) - AND USER_ACNT IN (#{userAccount}) + AND UPPER(USER_ACNT) IN (UPPER(#{userAccount})) AND USER_NM LIKE CONCAT('%', #{userName}, '%') AND A.LOG_TYPE = C.LOG_TYPE 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 @@ 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