diff --git a/src/main/java/kr/xit/fims/biz/cmm/service/bean/FimsCrackdownMgtServiceBean.java b/src/main/java/kr/xit/fims/biz/cmm/service/bean/FimsCrackdownMgtServiceBean.java index 5bede765..62337040 100644 --- a/src/main/java/kr/xit/fims/biz/cmm/service/bean/FimsCrackdownMgtServiceBean.java +++ b/src/main/java/kr/xit/fims/biz/cmm/service/bean/FimsCrackdownMgtServiceBean.java @@ -241,7 +241,7 @@ public class FimsCrackdownMgtServiceBean extends AbstractServiceBean implements erppDTO.setRgtr(getUserInfo().getUniqId()); erppDTO.setSysSeCd(getUserInfo().getOrgId()); - erppDTO.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())); + erppDTO.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getNsttCd())); rtCrackdownMgtMapper.insertRtErpp(erppDTO); // 시민신고인 경우 @@ -285,7 +285,7 @@ public class FimsCrackdownMgtServiceBean extends AbstractServiceBean implements @Override public void addCtznSttemntCmplt(final FimsCrackdownDTO.CtznSttemntCmplt dto) { - dto.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())); + dto.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getNsttCd())); dto.setRgtr(getUserInfo().getUniqId()); mapper.insertCtznSttemntCmplt(dto); } @@ -379,7 +379,7 @@ public class FimsCrackdownMgtServiceBean extends AbstractServiceBean implements String ansTxt = getAnswerText(mapper.selectCtznAnswerTmplInfo(ansReqDTO)); CtznStmtDTO.Ans ansDTO = CtznStmtDTO.Ans.builder() - .sggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())) + .sggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getNsttCd())) .sysSeCd(getUserInfo().getOrgId()) .interfaceSeqN(saveDTO.getInterfaceSeqN()) .cvlcptPrcsRsltCn(ansTxt) diff --git a/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCctvCrackdownServiceBean.java b/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCctvCrackdownServiceBean.java index 6d5fe965..799aa22a 100644 --- a/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCctvCrackdownServiceBean.java +++ b/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCctvCrackdownServiceBean.java @@ -136,9 +136,9 @@ public class EcCctvCrackdownServiceBean extends AbstractServiceBean implements E CctvCrackdownDTO.ExtrlRegltCntc extrDTO = getExtrlRegltCntcDTO(txtNames[0], records); extrDTO.setSysSeCd(getUserInfo().getOrgId()); - extrDTO.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())); + extrDTO.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getNsttCd())); extrDTO.setSggNm(xitFrameCodeService.getSggNm(extrDTO.getSggCd())); - extrDTO.setInstCd(getUserInfo().getPstinstCode()); + extrDTO.setInstCd(getUserInfo().getNsttCd()); if(records.size() >= 3){ extrDTO.setCrdnSeCd(FimsConst.CrdnSeCd.CCTV_DRV.getCode()); @@ -191,7 +191,7 @@ public class EcCctvCrackdownServiceBean extends AbstractServiceBean implements E ExtnlInterfaceUtils.parseFileBusinstallToObject(busInstallDTO, filePath + "/" + fi.getFileNm(), uploadRoot + uploadTempPath); - String sggCd = xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode()); + String sggCd = xitFrameCodeService.instCdToSggCd(getUserInfo().getNsttCd()); // 외부연계 테이블 생성 CctvCrackdownDTO.ExtrlRegltCntc extrDTO = CctvCrackdownDTO.ExtrlRegltCntc @@ -199,7 +199,7 @@ public class EcCctvCrackdownServiceBean extends AbstractServiceBean implements E .sysSeCd(getUserInfo().getOrgId()) .sggCd(sggCd) .sggNm(xitFrameCodeService.getSggNm(sggCd)) - .instCd(getUserInfo().getPstinstCode()) + .instCd(getUserInfo().getNsttCd()) .vhrno(busInstallDTO.getVhrno()) //.crndDongNm(mdInfos[1]) //.crdnPlc(mdInfos[2]) diff --git a/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCtznSttemntServiceBean.java b/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCtznSttemntServiceBean.java index d8be6f8b..235eebc1 100644 --- a/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCtznSttemntServiceBean.java +++ b/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCtznSttemntServiceBean.java @@ -161,7 +161,7 @@ public class EcCtznSttemntServiceBean extends AbstractServiceBean implements EcC // 답변 테이블 insert(save) dto.setSysSeCd(getUserInfo().getOrgId()); - dto.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())); + dto.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getNsttCd())); dto.setRgtr(getUserInfo().getUniqId()); mapper.saveEcCtznSttemntAnswer(dto); diff --git a/src/main/java/kr/xit/fims/biz/ec/service/bean/EcNatlNewspaperServiceBean.java b/src/main/java/kr/xit/fims/biz/ec/service/bean/EcNatlNewspaperServiceBean.java index 2659e621..5ce1e1b0 100644 --- a/src/main/java/kr/xit/fims/biz/ec/service/bean/EcNatlNewspaperServiceBean.java +++ b/src/main/java/kr/xit/fims/biz/ec/service/bean/EcNatlNewspaperServiceBean.java @@ -148,7 +148,7 @@ public class EcNatlNewspaperServiceBean extends AbstractServiceBean implements E FimsCrackdownDTO.Request reqDTO = FimsCrackdownDTO.Request .builder() .interfaceSeqN(xmlDto.getInterfaceSeqN()) - .sggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())) + .sggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getNsttCd())) .sysSeCd(getUserInfo().getOrgId()) .gpsX(dtl.getGpsX()) .gpsY(dtl.getGpsY()) @@ -216,7 +216,7 @@ public class EcNatlNewspaperServiceBean extends AbstractServiceBean implements E String reasonStr = xmlDto.getPetiReasonL(); mst.setInterfaceSeqN(xmlDto.getInterfaceSeqN()); - mst.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())); + mst.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getNsttCd())); mst.setSysSeCd(getUserInfo().getOrgId()); mst.setCvlcptAplySeCd(xmlDto.getPetiGubunC()); mst.setCvlcptAplyNo(xmlDto.getPetiNoC()); @@ -264,7 +264,7 @@ public class EcNatlNewspaperServiceBean extends AbstractServiceBean implements E //공통 추가 항목 dtl.setInterfaceSeqN(xmlDto.getInterfaceSeqN()); dtl.setSysSeCd(getUserInfo().getOrgId()); - dtl.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())); + dtl.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getNsttCd())); dtl.setRgtr(getUserInfo().getUniqId()); } diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java b/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java index dc5e220b..1f89b447 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java @@ -56,7 +56,7 @@ public class XitLoginVO implements Serializable{ /** * 소속기관 코드 - 업무그룹(sgg_cd) */ - private String pstinstCode; + private String nsttCd; /** 업무 데이터 권한 */ private String jobDataAuthor; /** 사용자 관리 권한 */ @@ -92,7 +92,7 @@ public class XitLoginVO implements Serializable{ this.orgId = vo.getOrgId(); this.orgnztNm = vo.getOrgnztNm(); this.grpId = vo.getGrpId(); - this.pstinstCode = vo.getPstinstCode(); + this.nsttCd = vo.getNsttCd(); this.uniqId = vo.getEsntlId(); this.jobDataAuthor = vo.getJobDataAuthor(); this.userManageAuthor = vo.getUserManageAuthor(); diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java b/src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java index 9890747a..b56e016c 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java @@ -35,7 +35,7 @@ public class XitUserInfoChangeDtlsVO extends BaseVO { protected String mbtlnum; //이동전화번호 protected String email_adres; //이메일 주소 - protected String pstinst_code; //소속기관 코드 + protected String nstt_cd; //소속기관 코드 protected String user_sttus_code; //사용자 상태 코드 protected String esntl_id; //고유 id @@ -132,11 +132,11 @@ public class XitUserInfoChangeDtlsVO extends BaseVO { this.email_adres = email_adres; } - public String getPstinst_code() { - return pstinst_code; + public String getNstt_cd() { + return nstt_cd; } - public void setPstinst_code(String pstinst_code) { - this.pstinst_code = pstinst_code; + public void setNstt_cd(String nstt_cd) { + this.nstt_cd = nstt_cd; } public String getUser_sttus_code() { return user_sttus_code; diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitSessionMapping.java b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitSessionMapping.java index 31f2df48..b9b33754 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitSessionMapping.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitSessionMapping.java @@ -52,7 +52,7 @@ public class XitSessionMapping extends EgovUsersByUsernameMapping { String strUserEmail = rs.getString("user_email"); String strOrgId = rs.getString("org_id"); String strGrpId = rs.getString("grp_id"); - String strPstinstCode = rs.getString("pstinst_code"); + String strNsttCd = rs.getString("nstt_cd"); String strOrgnztNm = rs.getString("orgnzt_nm"); String strUniqId = rs.getString("esntl_id"); String strJobDataAuthor = rs.getString("job_data_author"); @@ -75,7 +75,7 @@ public class XitSessionMapping extends EgovUsersByUsernameMapping { loginVO.setOrgnztNm(strOrgnztNm); //조직(부서)ID 명 loginVO.setUniqId(strUniqId); //고유아이디 loginVO.setGrpId(strGrpId); //그룹 - loginVO.setPstinstCode(strPstinstCode); //소속기관-업무그룹(sgg_cd) + loginVO.setNsttCd(strNsttCd); //소속기관-업무그룹(sgg_cd) loginVO.setJobDataAuthor(strJobDataAuthor); //업무 데이터 권한 loginVO.setUserManageAuthor(strUserManageAuthor); //사용자 관리 권한 loginVO.setElctrnsanctnUseYn(strElctrnsanctnUseYn); //전자결재 사용 여부 diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitFrameAnonymousController.java b/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitFrameAnonymousController.java index 20ca4558..689794d2 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitFrameAnonymousController.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitFrameAnonymousController.java @@ -123,7 +123,7 @@ public class XitFrameAnonymousController extends AbstractController { ================*/ model.addAttribute("passwordHint_result" , xitFrameCodeService.findCmmnDetailCodes("XIT022")); //패스워트힌트코드 목록 model.addAttribute("sexdstnCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT014")); //성별구분코드 목록 - model.addAttribute("pstinstCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT025")); //소속기관코드 목록 + model.addAttribute("nsttCd_result" , xitFrameCodeService.findCmmnDetailCodes("XIT025")); //소속기관코드 목록 model.addAttribute("orgId_result" , xitFrameCodeService.findOrgnztCodes("XIT_ORGNZT_INFO")); //조직정보코드 목록 model.addAttribute("grpId_result" , xitFrameCodeService.findGroupCodes("XIT_ORGNZT_INFO")); //그룹정보코드 목록 break; @@ -146,7 +146,7 @@ public class XitFrameAnonymousController extends AbstractController { // model.addAttribute("indutyCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT027")); //업종코드 목록 // //업무사용자 // model.addAttribute("userSttusCode_result" , userSttus_result); //사용자상태코드 목록 -// model.addAttribute("pstinstCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT025")); //소속기관코드 목록 +// model.addAttribute("nsttCd_result" , xitFrameCodeService.findCmmnDetailCodes("XIT025")); //소속기관코드 목록 // model.addAttribute("orgId_result" , xitFrameCodeService.findOrgnztCodes("XIT_ORGNZT_INFO")); //조직정보코드 목록 break; @@ -185,7 +185,7 @@ public class XitFrameAnonymousController extends AbstractController { model.addAttribute("sexdstnCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT014")); //성별구분코드 목록 model.addAttribute("grpId_result" , xitFrameCodeService.findGroupCodes("XIT_ORGNZT_INFO")); //그룹정보코드 목록 model.addAttribute("userSttusCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT013")); //사용자상태코드 목록 - model.addAttribute("pstinstCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT025")); //소속기관코드 목록 + model.addAttribute("nsttCd_result" , xitFrameCodeService.findCmmnDetailCodes("XIT025")); //소속기관코드 목록 model.addAttribute("orgId_result" , xitFrameCodeService.findOrgnztCodes("XIT_ORGNZT_INFO")); //조직정보코드 목록 break; diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java index 96581725..e94196d7 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java @@ -44,7 +44,7 @@ public class XitUserInfoVO extends XitUserEtcOptionVO { protected String emailAdres; //이메일 주소 protected String ofcpsNm; //직위 명 protected String grpId; //그룹 id - 업무그룹(sgg_cd) - protected String pstinstCode; //소속기관 코드 - 시스템코드(sysSeCd) + protected String nsttCd; //소속기관 코드 - 시스템코드(sysSeCd) protected String userSttusCode; //사용자 상태 코드 protected String esntlId; //고유 id protected String crtfcDnValue; //인증 dn 값 diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserRegMngVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserRegMngVO.java index 6ff566b5..17a1e0f1 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserRegMngVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserRegMngVO.java @@ -87,7 +87,7 @@ public class XitUserRegMngVO extends BaseVO { /** * 소속기관코드 */ - private String pstinstCode; + private String nsttCd; /** * 검색조건 회원타입 */ 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 ca0771a3..6b223c8d 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 @@ -247,7 +247,7 @@ public class UserMgtServiceBean extends AbstractServiceBean implements UserMgtSe case "ALL": //모든 사용자 return true; case "DEPT": //자신이 속한 부서의 모든 사용자 - if(loginUserVO.getPstinstCode().equals(tgtUserVO.getPstinstCode())) + if(loginUserVO.getNsttCd().equals(tgtUserVO.getNsttCd())) return true; break; case "ORGNZT": //자신이 속한 조직의 모든 사용자 diff --git a/src/main/resources/message/category/mng/user/reg/message_en.properties b/src/main/resources/message/category/mng/user/reg/message_en.properties index af627255..2486064b 100644 --- a/src/main/resources/message/category/mng/user/reg/message_en.properties +++ b/src/main/resources/message/category/mng/user/reg/message_en.properties @@ -100,7 +100,7 @@ comUssUmt.deptUserManageRegist.status=User Status Code comUssUmt.deptUserManageRegistBtn.idSearch=Search Duplicate ID comUssUmt.deptUserManageRegist.crtfcDnValue=User DN -comUssUmt.deptUserManageRegist.pstinstCode=Organization Code +comUssUmt.deptUserManageRegist.nsttCd=Organization Code comUssUmt.deptUserManageRegist.orgId=Organization ID comUssUmt.deptUserManageRegist.ofcps=Position comUssUmt.deptUserManageRegist.emplNum=Employee Number diff --git a/src/main/resources/message/category/mng/user/reg/message_ko.properties b/src/main/resources/message/category/mng/user/reg/message_ko.properties index afc18fa6..d6af7653 100644 --- a/src/main/resources/message/category/mng/user/reg/message_ko.properties +++ b/src/main/resources/message/category/mng/user/reg/message_ko.properties @@ -100,7 +100,7 @@ comUssUmt.deptUserManageRegist.status=\uC77C\uBC18\uD68C\uC6D0\uC0C1\uD0DC\uCF54 comUssUmt.deptUserManageRegistBtn.idSearch=\uC911\uBCF5\uC544\uC774\uB514 \uAC80\uC0C9 comUssUmt.deptUserManageRegist.crtfcDnValue=\uC0AC\uC6A9\uC790DN -comUssUmt.deptUserManageRegist.pstinstCode=\uC18C\uC18D\uAE30\uAD00\uCF54\uB4DC +comUssUmt.deptUserManageRegist.nsttCd=\uC18C\uC18D\uAE30\uAD00\uCF54\uB4DC comUssUmt.deptUserManageRegist.orgId=\uC870\uC9C1\uC544\uC774\uB514 comUssUmt.deptUserManageRegist.ofcps=\uC9C1\uC704 comUssUmt.deptUserManageRegist.emplNum=\uC0AC\uBC88 diff --git a/src/main/resources/spring/service/context-security.xml b/src/main/resources/spring/service/context-security.xml index 5a2d8976..e4d500dc 100644 --- a/src/main/resources/spring/service/context-security.xml +++ b/src/main/resources/spring/service/context-security.xml @@ -120,7 +120,7 @@ , ORG_ID , ESNTL_ID , GRP_ID - , PSTINST_CODE + , NSTT_CD , ORGNZT_NM , JOB_DATA_AUTHOR , USER_MANAGE_AUTHOR 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 5b612721..6dcf8686 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 @@ -2080,7 +2080,7 @@ ,OFFM_TELNO ,MBTLNUM ,EMAIL_ADRES - ,PSTINST_CODE + ,NSTT_CD ,USER_STTUS_CODE ,ESNTL_ID FROM XIT_USER_INFO_CHANGE_DTLS @@ -2100,7 +2100,7 @@ AND OFFM_TELNO = #{offm_telno } AND MBTLNUM = #{mbtlnum } AND EMAIL_ADRES = #{email_adres } - AND PSTINST_CODE = #{pstinst_code } + AND NSTT_CD = #{nstt_cd } AND USER_STTUS_CODE = #{user_sttus_code } AND ESNTL_ID = #{esntl_id } @@ -2122,7 +2122,7 @@ ,OFFM_TELNO ,MBTLNUM ,EMAIL_ADRES - ,PSTINST_CODE + ,NSTT_CD ,USER_STTUS_CODE ,ESNTL_ID FROM XIT_USER_INFO_CHANGE_DTLS @@ -2149,7 +2149,7 @@ ,OFFM_TELNO ,MBTLNUM ,EMAIL_ADRES - ,PSTINST_CODE + ,NSTT_CD ,USER_STTUS_CODE ,ESNTL_ID )VALUES( @@ -2168,7 +2168,7 @@ ,#{offm_telno } ,#{mbtlnum } ,#{email_adres } - ,#{pstinst_code } + ,#{nstt_cd } ,#{user_sttus_code } ,#{esntl_id } ) @@ -2192,7 +2192,7 @@ ,OFFM_TELNO = #{offm_telno } ,MBTLNUM = #{mbtlnum } ,EMAIL_ADRES = #{email_adres } - ,PSTINST_CODE = #{pstinst_code } + ,NSTT_CD = #{nstt_cd } ,USER_STTUS_CODE = #{user_sttus_code } ,ESNTL_ID = #{esntl_id } WHERE 1=1 @@ -2240,7 +2240,7 @@ ,EMAIL_ADRES ,OFCPS_NM ,GRP_ID - ,PSTINST_CODE + ,NSTT_CD ,USER_STTUS_CODE ,ESNTL_ID ,CRTFC_DN_VALUE @@ -2266,7 +2266,7 @@ AND EMAIL_ADRES = #{email_adres } AND OFCPS_NM = #{ofcps_nm } AND GRP_ID = #{grp_id } - AND PSTINST_CODE = #{pstinst_code } + AND NSTT_CD = #{nstt_cd } AND USER_STTUS_CODE = #{user_sttus_code } AND ESNTL_ID = #{esntl_id } AND CRTFC_DN_VALUE = #{crtfc_dn_value } @@ -2293,7 +2293,7 @@ ,EMAIL_ADRES ,OFCPS_NM ,GRP_ID - ,PSTINST_CODE + ,NSTT_CD ,USER_STTUS_CODE ,ESNTL_ID ,CRTFC_DN_VALUE @@ -2326,7 +2326,7 @@ , email_adres , ofcps_nm , grp_id - , pstinst_code + , nstt_cd , user_sttus_code , esntl_id , crtfc_dn_value @@ -2351,7 +2351,7 @@ , #{emailAdres} , #{ofcpsNm} , #{grpId} - , #{pstinstCode} + , #{nsttCd} , #{userSttusCode} , #{esntlId} , #{crtfcDnValue} @@ -2382,7 +2382,7 @@ ,EMAIL_ADRES = #{email_adres } ,OFCPS_NM = #{ofcps_nm } ,GRP_ID = #{grp_id } - ,PSTINST_CODE = #{pstinst_code } + ,NSTT_CD = #{nstt_cd } ,USER_STTUS_CODE = #{user_sttus_code } ,ESNTL_ID = #{esntl_id } ,CRTFC_DN_VALUE = #{crtfc_dn_value } @@ -2418,7 +2418,7 @@ ,A.EMAIL_ADRES ,A.OFCPS_NM ,A.GRP_ID - ,A.PSTINST_CODE + ,A.NSTT_CD ,A.USER_STTUS_CODE ,A.ESNTL_ID ,A.CRTFC_DN_VALUE @@ -2449,7 +2449,7 @@ AND A.EMAIL_ADRES = #{email_adres } AND A.OFCPS_NM = #{ofcps_nm } AND A.GRP_ID = #{grp_id } - AND A.PSTINST_CODE = #{pstinst_code } + AND A.NSTT_CD = #{nstt_cd } AND A.USER_STTUS_CODE = #{user_sttus_code } AND A.ESNTL_ID = #{esntl_id } AND A.CRTFC_DN_VALUE = #{crtfc_dn_value } @@ -2480,7 +2480,7 @@ ,A.EMAIL_ADRES ,A.OFCPS_NM ,A.GRP_ID - ,A.PSTINST_CODE + ,A.NSTT_CD ,A.USER_STTUS_CODE ,A.ESNTL_ID ,A.CRTFC_DN_VALUE 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 137cc415..16b80b17 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 @@ -94,7 +94,7 @@ ,A.OFCPS_NM AS "ofcpsNm" ,A.GRP_ID AS "grpId" ,A.ORG_ID AS "orgId" - ,A.PSTINST_CODE AS "pstinstCode" + ,A.NSTT_CD AS "nsttCd" ,A.USER_STTUS_CODE AS "userSttusCode" ,A.REG_DT AS "regDt" ,A.CRTFC_DN_VALUE AS "crtfcDnValue" 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 0b3bcc44..02d64f24 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 @@ -59,7 +59,7 @@ , ofcps_nm , grp_id , org_id - , pstinst_code + , nstt_cd , user_sttus_code , REG_DT , crtfc_dn_value @@ -90,7 +90,7 @@ , email_adres , ofcps_nm , grp_id - , pstinst_code + , nstt_cd , user_sttus_code , esntl_id , crtfc_dn_value @@ -115,7 +115,7 @@ , #{emailAdres} , #{ofcpsNm} , #{grpId} - , #{pstinstCode} + , #{nsttCd} , #{userSttusCode} , #{esntlId} , #{crtfcDnValue} @@ -142,7 +142,7 @@ , email_adres = IF(email_adres = #{emailAdres}, email_adres, #{emailAdres}) , ofcps_nm = IF(ofcps_nm = #{ofcpsNm}, ofcps_nm, #{ofcpsNm}) , grp_id = IF(grp_id = #{grpId}, grp_id, #{grpId}) - , pstinst_code = IF(pstinst_code = #{pstinstCode}, pstinst_code, #{pstinstCode}) + , nstt_cd = IF(nstt_cd = #{nsttCd}, nstt_cd, #{nsttCd}) , user_sttus_code = IF(user_sttus_code = #{userSttusCode}, user_sttus_code, #{userSttusCode}) , crtfc_dn_value = IF(crtfc_dn_value = #{crtfcDnValue}, crtfc_dn_value, #{crtfcDnValue}) @@ -161,7 +161,7 @@ SELECT xui.esntl_id , xui.org_id , xui.grp_id - , xui.pstinst_code + , xui.nstt_cd , ueo.user_manage_author , ueo.elctrnsanctn_use_yn FROM xit_user_info xui @@ -368,7 +368,7 @@ , offm_telno , mbtlnum , email_adres - , pstinst_code + , nstt_cd , user_sttus_code , esntl_id ) SELECT user_id @@ -386,7 +386,7 @@ , offm_telno , mbtlnum , email_adres - , pstinst_code + , nstt_cd , user_sttus_code , esntl_id FROM xit_user_info 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 f5c2fa67..b5bc864b 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 @@ -198,11 +198,11 @@ table { - + - + - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/forms/UserForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/forms/UserForm.jsp index 723e3f85..f144b269 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/forms/UserForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/forms/UserForm.jsp @@ -92,14 +92,14 @@ - + - + - + - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_edit.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_edit.jsp index 5c6dc9c2..ff4aa61d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_edit.jsp @@ -143,11 +143,11 @@ table { - + - + - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_input.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_input.jsp index 16594688..97a83777 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_input.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_input.jsp @@ -92,11 +92,11 @@ - + - + - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp index 3f591945..3a177140 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp @@ -202,11 +202,11 @@ table { - + - + - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtPopup.jsp index 852be848..0d9a514a 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtPopup.jsp @@ -93,8 +93,8 @@ - - + +