From ca89784e3ed3798a0d6003d900bd6d0da32fe1a9 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Wed, 7 Jun 2023 16:35:34 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=9C=A0=EC=A0=80=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/service/bean/UserMgtServiceBean.java | 4 +- .../cmm/XitFrameCrud-mysql-mapper.xml | 2 +- .../mng/usr/XitUserAbsntMng-mysql-mapper.xml | 2 + .../mng/usr/XitUserEtcOptMng-mysql-mapper.xml | 13 +++-- .../framework/mng/usr/user-mysql-mapper.xml | 58 +++++++++---------- .../biz/cmm/anonymous/XitUserReg_input.jsp | 1 - 6 files changed, 41 insertions(+), 39 deletions(-) diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java index 0000c095..58640641 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java @@ -290,8 +290,8 @@ public class UserMgtServiceBean extends AbstractServiceBean implements UserMgtSe String encryptPass = null; String encryptNewPass = null; try { - encryptPass = XitScrtyUtil.encryptPassword(oldPassword, id); - encryptNewPass = XitScrtyUtil.encryptPassword(newPassword, id); + encryptPass = XitScrtyUtil.encryptPassword(oldPassword, accountId); + encryptNewPass = XitScrtyUtil.encryptPassword(newPassword, accountId); } catch (Exception e) { throw new RuntimeException(String.format("비밀번호 암호화 실패:: %s", e.getMessage())); } diff --git a/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml index ba68b552..ec1f0f52 100644 --- a/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml @@ -1926,7 +1926,7 @@ ,MDFR FROM XIT_USER_ABSNCE WHERE 1=1 - AND USER_ID = #{userAcnt} + AND USER_ID = #{userId} AND USER_ABSNCE_YN = #{userAbsnceYn} AND REG_DT = #{regDt} AND RGTR = #{rgtr} diff --git a/src/main/resources/sql/mapper/framework/mng/usr/XitUserAbsntMng-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/usr/XitUserAbsntMng-mysql-mapper.xml index ce227ea1..ce5b06ea 100644 --- a/src/main/resources/sql/mapper/framework/mng/usr/XitUserAbsntMng-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/usr/XitUserAbsntMng-mysql-mapper.xml @@ -13,6 +13,7 @@ SELECT X.USER_ID AS "userId" + ,X.USER_ACNT AS "userAcnt" ,X.USER_NM AS "userNm" ,X.USER_ABSNCE_YN AS "userAbsnceYn" ,X.REG_YN AS "regYn" @@ -22,6 +23,7 @@ FROM ( SELECT A.USER_ID + ,A.USER_ACNT ,A.USER_NM ,(CASE WHEN B.USER_ABSNCE_YN IS NULL THEN 'N' diff --git a/src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml index 46d58c36..6eb47bbc 100644 --- a/src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml @@ -12,7 +12,8 @@ - SELECT A.USER_ID AS "userId" + SELECT A.USER_ID AS "userId" + ,A.USER_ACNT AS "userAcnt" ,A.USER_NM AS "userNm" ,B.JOB_DATA_AUTHOR AS "jobDataAuthor" ,B.USER_MANAGE_AUTHOR AS "userManageAuthor" @@ -26,7 +27,7 @@ - AND A.USER_ID LIKE #{searchKeyword} + AND A.USER_ACNT LIKE #{searchKeyword} AND A.USER_NM LIKE CONCAT('%',#{searchKeyword},'%') @@ -50,7 +51,7 @@ WHERE 1 = 1 - ORDER BY A.USER_ID + ORDER BY A.USER_ACNT @@ -73,9 +74,9 @@ diff --git a/src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml index 0131046a..2fb4cdb8 100644 --- a/src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml @@ -7,9 +7,9 @@ ************************************************************************************************************** --> /* user-mysql-mapper|selectUser-사용자 정보 조회|julim */ - SELECT user_key AS uniqId + SELECT USER_ID AS uniqId , 'USR03' AS userTy - , user_id AS emplyrId + , USER_ACNT AS emplyrId , user_nm AS emplyrNm , passwd , passwd_hint @@ -64,14 +64,15 @@ , REG_DT , crtfc_dn FROM tb_user - WHERE user_key = #{uniqId} + WHERE USER_ID = #{uniqId} /* user-mysql-mapper|insertUserInfo-사용자정보 등록|julim */ INSERT INTO tb_user( - user_id + USER_ID + , USER_ACNT , org_id , user_nm , passwd @@ -92,7 +93,6 @@ , grp_id , nstt_cd , stts - , user_key , crtfc_dn , LOCK_YN , LOCK_CNT @@ -100,6 +100,7 @@ , REG_DT ) VALUES ( #{userId} + , #{userAcnt} , #{orgId} , #{userNm} , #{passwd} @@ -120,7 +121,6 @@ , #{grpId} , #{nsttCd} , #{stts} - , #{userKey} , #{crtfcDn} , 'N' , 0 @@ -152,19 +152,19 @@ , stts = IF(stts = #{stts}, stts, #{stts}) , crtfc_dn = IF(crtfc_dn = #{crtfcDn}, crtfc_dn, #{crtfcDn}) - WHERE user_id = #{userId} + WHERE USER_ID = #{userId} /* user-mysql-mapper|deleteUserInfo-사용자정보 삭제|julim */ DELETE FROM tb_user - WHERE user_id = #{userId} + WHERE USER_ID = #{userId} @@ -278,7 +278,7 @@ ************************************************************************************************************** --> /* user-mysql-mapper|selectUserEtcOption-사용자기타옵션 조회|julim */ - SELECT user_id + SELECT USER_ID , job_data_author , user_manage_author , elctrnsanctn_use_yn , job_confm_author_yn FROM xit_user_etc_option - WHERE user_id = #{userId} + WHERE USER_ID = #{userId} /* user-mysql-mapper|insertUserEtcOption-사용자기타옵션 등록|julim */ INSERT INTO xit_user_etc_option( - user_id + USER_ID , job_data_author , user_manage_author , elctrnsanctn_use_yn @@ -340,14 +340,14 @@ , user_manage_author = #{userManageAuthor } , elctrnsanctn_use_yn= #{elctrnsanctnUseYn} , job_confm_author_yn= #{jobConfmAuthorYn} - WHERE user_id = #{userId} + WHERE USER_ID = #{userId} /* user-mysql-mapper|deleteUserEtcOption-사용자기타옵션 삭제|julim */ DELETE FROM XIT_USER_ETC_OPTION - WHERE user_id = #{userId} + WHERE USER_ID = #{userId} @@ -359,7 +359,8 @@ /* user-mysql-mapper|insertUserInfoChangeDtls-사용자정보변경이력내역 등록|julim */ INSERT INTO xit_user_info_change_dtls ( - user_id + USER_ID + , USER_ACNT , change_de , org_id , grp_id @@ -376,8 +377,8 @@ , eml_adrs , nstt_cd , stts - , user_key - ) SELECT user_id + ) SELECT USER_ID + , USER_ACNT , DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') , org_id , grp_id @@ -394,16 +395,15 @@ , eml_adrs , nstt_cd , stts - , user_key FROM tb_user - WHERE user_id = #{userId} + WHERE USER_ID = #{userId} /* user-mysql-mapper|deleteUserInfoChangeDtlsList-사용자정보변경이력 내역 목록 삭제|julim */ DELETE FROM xit_user_info_change_dtls - WHERE user_id = #{userId} + WHERE USER_ID = #{userId} diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/XitUserReg_input.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/XitUserReg_input.jsp index b62f9e93..bf402089 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/XitUserReg_input.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/XitUserReg_input.jsp @@ -136,7 +136,6 @@ table { - (중복아이디 검색)