xit-app
/
external-system-test
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix : 유저 관련 수정

Browse Source
main
이범준 1 year ago
parent 2053154aa8
commit ca89784e3e
6 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java
Unescape Escape View File

@ -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()));
}

2
src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml
Unescape Escape View File

@ -1926,7 +1926,7 @@
,MDFR
FROM XIT_USER_ABSNCE
WHERE 1=1
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(userAcnt)">AND USER_ID = #{userAcnt}</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(userId)">AND USER_ID = #{userId}</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(userAbsnceYn)">AND USER_ABSNCE_YN = #{userAbsnceYn}</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notempty(regDt)">AND REG_DT = #{regDt}</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(rgtr)">AND RGTR = #{rgtr}</if>

2
src/main/resources/sql/mapper/framework/mng/usr/XitUserAbsntMng-mysql-mapper.xml
Unescape Escape View File

@ -13,6 +13,7 @@
<sql id="findList_SELECT">
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 @@
<sql id="findList_FROM">
FROM (
SELECT A.USER_ID
,A.USER_ACNT
,A.USER_NM
,(CASE
WHEN B.USER_ABSNCE_YN IS NULL THEN 'N'

13
src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml
Unescape Escape View File

@ -12,7 +12,8 @@
<sql id="findList_SELECT">
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 @@
<sql id="findList_WHERE">
<choose>
<when test="'0'.toString() == searchCondition">
AND A.USER_ID LIKE #{searchKeyword}
AND A.USER_ACNT LIKE #{searchKeyword}
</when>
<when test="'1'.toString() == searchCondition">
AND A.USER_NM LIKE CONCAT('%',#{searchKeyword},'%')
@ -50,7 +51,7 @@
<include refid="findList_FROM"/>
WHERE 1 = 1
<include refid="findList_WHERE"/>
ORDER BY A.USER_ID
ORDER BY A.USER_ACNT
<if test="searchGubun == 'list'">
<include refid="pageAfter" />
@ -73,9 +74,9 @@
<select id="findView" resultType="kr.xit.fims.framework.biz.mng.user.XitUserEtcOptMngVO">
/** XitUserEtcOptMngMapper.findView */
/** 사용자기타옵션관리 상세정보 조회 */
SELECT USER_KEY AS "uniqId"
SELECT USER_ID AS "uniqId"
,'USR03' AS "userTy"
,A.USER_ID AS "emplyrId"
,A.USER_ACNT AS "emplyrId"
,A.USER_NM AS "emplyrNm"
,A.PASSWD AS "passwd"
,A.PASSWD_HINT AS "passwdHint"
@ -103,7 +104,7 @@
,B.ELCTRNSANCTN_USE_YN AS "elctrnsanctnUseYn"
,B.JOB_CONFM_AUTHOR_YN AS "jobConfmAuthorYn"
<include refid="findList_FROM"/>
WHERE A.USER_KEY = #{uniqId}
WHERE A.USER_ID = #{uniqId}
</select>

58
src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml
Unescape Escape View File

@ -7,9 +7,9 @@
************************************************************************************************************** -->
<select id="selectUsers" resultType="kr.xit.fims.framework.biz.mng.user.XitUserInfoVO">
/* user-mysql-mapper|selectUsers-사용자 목록 조회|julim */
SELECT xui.user_key AS uniqId
SELECT xui.USER_ID AS uniqId
, 'USR03' AS userTy
, xui.user_id
, xui.USER_ACNT
, xui.user_nm
, xui.eml_adrs
, xui.area_no
@ -26,8 +26,8 @@
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(sbscrbSttus)">
AND xui.stts = #{sbscrbSttus}
</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(userId)">
AND INSTR(xui.user_id, #{userId}) > 0
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(userAcnt)">
AND INSTR(xui.USER_ACNT, #{userAcnt}) > 0
</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(userNm)">
AND INSTR(xui.user_nm, #{userNm}) > 0
@ -38,9 +38,9 @@
<select id="selectUser" resultType="kr.xit.fims.framework.biz.mng.user.XitUserInfoVO">
/* 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}
</select>
<insert id="insertUserInfo" parameterType="kr.xit.fims.framework.biz.mng.user.XitUserInfoVO">
/* 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})
</set>
WHERE user_id = #{userId}
WHERE USER_ID = #{userId}
</update>
<delete id="deleteUserInfo" parameterType="string">
/* user-mysql-mapper|deleteUserInfo-사용자정보 삭제|julim */
DELETE
FROM tb_user
WHERE user_id = #{userId}
WHERE USER_ID = #{userId}
</delete>
<select id="selectCheckUserInfo" parameterType="string" resultType="caseMap">
/* user-mysql-mapper|selectCheckUserInfo-사용자정보 user_key, grp_id 조회|julim */
SELECT xui.user_key
/* user-mysql-mapper|selectCheckUserInfo-사용자정보 USER_ID, grp_id 조회|julim */
SELECT xui.USER_ID
, xui.org_id
, xui.grp_id
, xui.nstt_cd
@ -172,8 +172,8 @@
, ueo.elctrnsanctn_use_yn
FROM tb_user xui
JOIN xit_user_etc_option ueo
ON xui.user_id = ueo.user_id
WHERE xui.user_id = #{userId}
ON xui.USER_ID = ueo.USER_ID
WHERE xui.USER_ID = #{userId}
</select>
@ -278,7 +278,7 @@
************************************************************************************************************** -->
<select id="selectUserEtcOptions" parameterType="kr.xit.fims.framework.biz.mng.user.XitUserEtcOptionVO" resultType="kr.xit.fims.framework.biz.mng.user.XitUserEtcOptionVO">
/* user-mysql-mapper|selectUserEtcOptions-사용자기타옵션 목록 조회|julim */
SELECT user_id
SELECT USER_ID
, job_data_author
, user_manage_author
, elctrnsanctn_use_yn
@ -286,7 +286,7 @@
FROM xit_user_etc_option
<where>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(userId)">
AND user_id = #{userId}
AND USER_ID = #{userId}
</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(jobDataAuthor)">
AND job_data_author = #{jobDataAuthor}
@ -306,20 +306,20 @@
<select id="selectUserEtcOption" parameterType="string" resultType="kr.xit.fims.framework.biz.mng.user.XitUserEtcOptionVO">
/* 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}
</select>
<insert id="insertUserEtcOption" parameterType="kr.xit.fims.framework.biz.mng.user.XitUserEtcOptionVO">
/* 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}
</update>
<delete id="deleteUserEtcOption" parameterType="string">
/* user-mysql-mapper|deleteUserEtcOption-사용자기타옵션 삭제|julim */
DELETE
FROM XIT_USER_ETC_OPTION
WHERE user_id = #{userId}
WHERE USER_ID = #{userId}
</delete>
@ -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}
</insert>
<delete id="deleteUserInfoChangeDtlsList">
/* user-mysql-mapper|deleteUserInfoChangeDtlsList-사용자정보변경이력 내역 목록 삭제|julim */
DELETE
FROM xit_user_info_change_dtls
WHERE user_id = #{userId}
WHERE USER_ID = #{userId}
</delete>

1
src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/XitUserReg_input.jsp
Unescape Escape View File

@ -136,7 +136,6 @@ table {
<input type="text" size="20" maxlength="20" disabled="disabled" id="id_view" name="id_view" style="width: 60%">
<form:input path="emplyrId" id="emplyrId" title="사용자아이디" size="20" maxlength="20" cssStyle="display:none"/>
<a href="#LINK" onclick="fnIdCheck(); return false;">
<!-- <img src="/resources/image/fims/framework/etc/img_search.gif" alt=""/> -->
<img src="<c:url value='/'/>/resources/image/fims/framework/common/more.png"/>(중복아이디 검색)
</a>
<form:errors path="emplyrId" cssClass="error"/>

Write Preview
Loading…
Cancel
Save