diff --git a/src/main/resources/sql/mapper/base/user-mapper.xml b/src/main/resources/sql/mapper/base/user-mapper.xml index 7b58bad0..973dfa91 100644 --- a/src/main/resources/sql/mapper/base/user-mapper.xml +++ b/src/main/resources/sql/mapper/base/user-mapper.xml @@ -99,11 +99,13 @@ SELECT A.USER_ID /* 사용자 목록 조회(userMapper.getUserList) */ - + + /* 사용자 가져오기(userMapper.getUsers) */ - + + /* 사용자 계정 가져오기(userMapper.getUser) */ @@ -239,6 +241,7 @@ UPDATE TB_USER , DEPT_CD = #{deptCode} , CRTFC_DN = #{certificateDn} , STTS = #{status} + , USE_YN = 'N' , MDFCN_DT = , MDFR = #{modifiedBy} WHERE USER_ID = #{id} diff --git a/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp b/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp index 32ae6104..8ca19cdb 100644 --- a/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp @@ -154,6 +154,10 @@ 신청 + + + 삭제 + @@ -209,6 +213,14 @@ infoPrefixControl.setInfo = (obj) => { $("#infoPrefix-form input[name='account']").prop("readonly", !create); $("#infoPrefix-form input[name='name']").prop("readonly", !create); + if(create){ + $("#infoPrefix-form :radio[name='status'][value='D']").attr("hidden","hidden"); + $("#infoPrefix-form label[for='removed']").attr("hidden","hidden"); + } else { + $("#infoPrefix-form :radio[name='status'][value='D']").removeAttr("hidden"); + $("#infoPrefix-form label[for='removed']").removeAttr("hidden"); + } + $("#infoPrefix-form input[type='password']").each(function(){ let password = $(this).prop("required", create); let div = password.parent().parent().parent(); @@ -232,8 +244,16 @@ infoPrefixControl.setInfo = (obj) => { } else { mobilePhoneNoDiv.attr("hidden","hidden"); } - - $("#infoPrefix-form label[for='STTS']").html(obj.data.STTS == "P" ? "승인" : "신청"); + + let stts = ""; + if(obj.data.STTS == "D"){ + stts = "삭제"; + } else if(obj.data.STTS == "P"){ + stts = "승인"; + } else { + stts = "신청"; + } + $("#infoPrefix-form label[for='STTS']").html(stts); $("#infoPrefix-form").find("input,select") .change(function() { 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 9ba4e34f..0d33a068 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 @@ -26,6 +26,7 @@ + 상태 사용자구분 기관 계정 @@ -41,6 +42,7 @@ + {STTS_NM} {USER_SE_NM} {INST_NM} {USER_ACNT} @@ -53,7 +55,7 @@ - ${prefixName} 정보를 찾지 못했습니다. + ${prefixName} 정보를 찾지 못했습니다.