From f55794df5693bb9ffbf0967d3914584e0f136ff7 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 2 Jun 2023 14:13:37 +0900 Subject: [PATCH] =?UTF-8?q?refactor=20:=20=EC=9C=A0=EC=A0=80=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/FimsCrackdownMgtServiceBean.java | 4 +- .../bean/EcCctvCrackdownServiceBean.java | 4 +- .../bean/EcCtznSttemntServiceBean.java | 2 +- .../bean/EcNatlNewspaperServiceBean.java | 6 +-- .../fims/framework/biz/cmm/XitLoginVO.java | 4 +- .../framework/biz/cmm/XitOrgnztInfoVO.java | 2 +- .../biz/cmm/XitUserInfoChangeDtlsVO.java | 10 ++-- .../biz/cmm/service/XitFrameCodeService.java | 4 +- .../service/bean/XitFrameCodeServiceBean.java | 6 +-- .../service/bean/XitFrameCrudServiceBean.java | 10 ++-- .../service/bean/XitFrameUnitServiceBean.java | 2 +- .../cmm/service/bean/XitSessionMapping.java | 4 +- .../cmm/web/XitFrameAnonymousController.java | 6 +-- .../biz/cmm/web/XitMainController.java | 2 +- .../framework/biz/mng/menu/MenuListMngVO.java | 18 ++++---- .../framework/biz/mng/user/XitUserInfoVO.java | 2 +- .../biz/mng/user/XitUserRegMngVO.java | 2 +- .../user/service/bean/UserMgtServiceBean.java | 2 +- .../fims/framework/core/XitMenuManageVO.java | 4 +- .../mng/user/reg/message_en.properties | 2 +- .../mng/user/reg/message_ko.properties | 2 +- .../spring/service/context-idgen-xit.xml | 2 +- .../spring/service/context-security.xml | 4 +- .../cache/cachecode-mysql-mapper.xml | 2 +- .../cmm/XitFrameCode-mysql-mapper.xml | 6 +-- .../cmm/XitFrameCrud-mysql-mapper.xml | 46 +++++++++---------- .../mng/usr/XitUserEtcOptMng-mysql-mapper.xml | 2 +- .../framework/mng/usr/user-mysql-mapper.xml | 14 +++--- .../framework/mng/usr/XitUserRegMng.xml | 2 +- .../fims/biz/cmm/cmmIntegratedSearchForm.jsp | 2 +- .../fims/biz/rt/rtAnswerTargetDataForm.jsp | 2 +- .../jsp/fims/biz/rt/rtAnswerWaitDataForm.jsp | 2 +- .../jsp/fims/biz/rt/rtInitialDataForm.jsp | 2 +- .../biz/cmm/anonymous/XitUserReg_input.jsp | 6 +-- .../biz/cmm/anonymous/forms/UserForm.jsp | 8 ++-- .../biz/mng/usr/backup/XitUserRegMng_edit.jsp | 6 +-- .../mng/usr/backup/XitUserRegMng_input.jsp | 6 +-- .../biz/mng/usr/backup/XitUserRegMng_view.jsp | 6 +-- .../framework/biz/mng/usr/mngUserMgtPopup.jsp | 4 +- 39 files changed, 110 insertions(+), 110 deletions(-) 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 a66a505e..5bede765 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 @@ -240,7 +240,7 @@ public class FimsCrackdownMgtServiceBean extends AbstractServiceBean implements } erppDTO.setRgtr(getUserInfo().getUniqId()); - erppDTO.setSysSeCd(getUserInfo().getOrgnztId()); + erppDTO.setSysSeCd(getUserInfo().getOrgId()); erppDTO.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())); rtCrackdownMgtMapper.insertRtErpp(erppDTO); @@ -380,7 +380,7 @@ public class FimsCrackdownMgtServiceBean extends AbstractServiceBean implements String ansTxt = getAnswerText(mapper.selectCtznAnswerTmplInfo(ansReqDTO)); CtznStmtDTO.Ans ansDTO = CtznStmtDTO.Ans.builder() .sggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())) - .sysSeCd(getUserInfo().getOrgnztId()) + .sysSeCd(getUserInfo().getOrgId()) .interfaceSeqN(saveDTO.getInterfaceSeqN()) .cvlcptPrcsRsltCn(ansTxt) .rgtr(getUserInfo().getUniqId()) 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 e7fa88d2..6d5fe965 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 @@ -134,7 +134,7 @@ public class EcCctvCrackdownServiceBean extends AbstractServiceBean implements E } // data set CctvCrackdownDTO.ExtrlRegltCntc extrDTO = getExtrlRegltCntcDTO(txtNames[0], records); - extrDTO.setSysSeCd(getUserInfo().getOrgnztId()); + extrDTO.setSysSeCd(getUserInfo().getOrgId()); extrDTO.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())); extrDTO.setSggNm(xitFrameCodeService.getSggNm(extrDTO.getSggCd())); @@ -196,7 +196,7 @@ public class EcCctvCrackdownServiceBean extends AbstractServiceBean implements E // 외부연계 테이블 생성 CctvCrackdownDTO.ExtrlRegltCntc extrDTO = CctvCrackdownDTO.ExtrlRegltCntc .builder() - .sysSeCd(getUserInfo().getOrgnztId()) + .sysSeCd(getUserInfo().getOrgId()) .sggCd(sggCd) .sggNm(xitFrameCodeService.getSggNm(sggCd)) .instCd(getUserInfo().getPstinstCode()) 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 365f0643..d8be6f8b 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 @@ -160,7 +160,7 @@ public class EcCtznSttemntServiceBean extends AbstractServiceBean implements EcC } // 답변 테이블 insert(save) - dto.setSysSeCd(getUserInfo().getOrgnztId()); + dto.setSysSeCd(getUserInfo().getOrgId()); dto.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())); 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 bf08e8ab..2659e621 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 @@ -149,7 +149,7 @@ public class EcNatlNewspaperServiceBean extends AbstractServiceBean implements E .builder() .interfaceSeqN(xmlDto.getInterfaceSeqN()) .sggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())) - .sysSeCd(getUserInfo().getOrgnztId()) + .sysSeCd(getUserInfo().getOrgId()) .gpsX(dtl.getGpsX()) .gpsY(dtl.getGpsY()) .vhrno(dtl.getVhrno()) @@ -217,7 +217,7 @@ public class EcNatlNewspaperServiceBean extends AbstractServiceBean implements E mst.setInterfaceSeqN(xmlDto.getInterfaceSeqN()); mst.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())); - mst.setSysSeCd(getUserInfo().getOrgnztId()); + mst.setSysSeCd(getUserInfo().getOrgId()); mst.setCvlcptAplySeCd(xmlDto.getPetiGubunC()); mst.setCvlcptAplyNo(xmlDto.getPetiNoC()); mst.setCvlcptRcptNo(xmlDto.getCivilNoC()); @@ -263,7 +263,7 @@ public class EcNatlNewspaperServiceBean extends AbstractServiceBean implements E //공통 추가 항목 dtl.setInterfaceSeqN(xmlDto.getInterfaceSeqN()); - dtl.setSysSeCd(getUserInfo().getOrgnztId()); + dtl.setSysSeCd(getUserInfo().getOrgId()); dtl.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())); 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 58ad3a84..94c1bf89 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 @@ -37,7 +37,7 @@ public class XitLoginVO implements Serializable{ /** * 조직ID - 시스템코드(sysSeCd) * */ - private String orgnztId; + private String orgId; /** 조직명 */ private String orgnztNm; /** 고유아이디 */ @@ -89,7 +89,7 @@ public class XitLoginVO implements Serializable{ this.password = vo.getPassword(); this.email = vo.getEmailAdres(); this.userSe = USER_SE.USR.name(); - this.orgnztId = vo.getOrgnztId(); + this.orgId = vo.getOrgId(); this.orgnztNm = vo.getOrgnztNm(); this.groupId = vo.getGroupId(); this.pstinstCode = vo.getPstinstCode(); diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/XitOrgnztInfoVO.java b/src/main/java/kr/xit/fims/framework/biz/cmm/XitOrgnztInfoVO.java index e69c12e9..ba0ce4d9 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/XitOrgnztInfoVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/XitOrgnztInfoVO.java @@ -26,7 +26,7 @@ public class XitOrgnztInfoVO { private static final long serialVersionUID = 2971244133704702294L; - private String orgnztId; //조직 id + private String orgId; //조직 id private String orgnztNm; //조직 명 private String dscrp; //조직 설명 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 f4f6b22b..425aa038 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 @@ -20,7 +20,7 @@ public class XitUserInfoChangeDtlsVO extends BaseVO { protected String user_id; //사용자 id protected String change_de; //변경 일 - protected String orgnzt_id; //조직 id + protected String org_id; //조직 id protected String group_id; //그룹 id protected String empl_no; //사원 번호 protected String sexdstn_code; //성별 코드 @@ -51,11 +51,11 @@ public class XitUserInfoChangeDtlsVO extends BaseVO { public void setChange_de(String change_de) { this.change_de = change_de; } - public String getOrgnzt_id() { - return orgnzt_id; + public String getOrg_id() { + return org_id; } - public void setOrgnzt_id(String orgnzt_id) { - this.orgnzt_id = orgnzt_id; + public void setOrg_id(String org_id) { + this.org_id = org_id; } public String getGroup_id() { return group_id; diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/service/XitFrameCodeService.java b/src/main/java/kr/xit/fims/framework/biz/cmm/service/XitFrameCodeService.java index 5826effc..8fc35a24 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/service/XitFrameCodeService.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/service/XitFrameCodeService.java @@ -53,12 +53,12 @@ public interface XitFrameCodeService { /** * 
메소드 설명: 조직코드 조회
* @param tableNm 테이블명 - * @param orgnztId 조직ID + * @param orgId 조직ID * @return Map 요청처리 후 응답객체 * @author: 박민규 * @date: 2020. 4. 8. */ - public XitCodeVO findOrgnztCode(String tableNm, String orgnztId); + public XitCodeVO findOrgnztCode(String tableNm, String orgId); /** * 
메소드 설명: 조직코드 목록 조회
* @param tableNm 테이블명 diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameCodeServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameCodeServiceBean.java index dfeeddc0..cacacfa2 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameCodeServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameCodeServiceBean.java @@ -103,13 +103,13 @@ public class XitFrameCodeServiceBean extends AbstractServiceBean implements XitF } @Override - public XitCodeVO findOrgnztCode(String tableNm, String orgnztId) { + public XitCodeVO findOrgnztCode(String tableNm, String orgId) { /** * 필수값 확인 */ if(XitCmmnUtil.isEmpty(tableNm)) throw new RuntimeException("테이블명(은)는 필수조건 입니다."); - if(XitCmmnUtil.isEmpty(orgnztId)) + if(XitCmmnUtil.isEmpty(orgId)) throw new RuntimeException("조직ID(은)는 필수조건 입니다."); /** @@ -117,7 +117,7 @@ public class XitFrameCodeServiceBean extends AbstractServiceBean implements XitF */ Map m = new HashMap(); m.put("tableNm", tableNm); - m.put("orgnztId", orgnztId); + m.put("orgId", orgId); /** * 처리 diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameCrudServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameCrudServiceBean.java index 1f532576..3a871720 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameCrudServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameCrudServiceBean.java @@ -2873,7 +2873,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF // * 필수조건 확인 // */ // String emsg = null; -// if(XitCmmnUtil.isEmpty(vo.getOrgnzt_id())) +// if(XitCmmnUtil.isEmpty(vo.getOrg_id())) // emsg = String.format("(%s)조직ID(은)는 필수조건 입니다.", table); // if(emsg!=null){ // logger.error(emsg); @@ -2904,7 +2904,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getOrgnztId())) + if(XitCmmnUtil.isEmpty(vo.getOrgId())) emsg = String.format("(%s)조직ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -2935,7 +2935,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getOrgnztId())) + if(XitCmmnUtil.isEmpty(vo.getOrgId())) emsg = String.format("(%s)조직ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -2968,7 +2968,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getOrgnztId())) + if(XitCmmnUtil.isEmpty(vo.getOrgId())) emsg = String.format("(%s)조직ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -3001,7 +3001,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getOrgnztId())) + if(XitCmmnUtil.isEmpty(vo.getOrgId())) emsg = String.format("(%s)조직ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java index 904356cf..d9dc3390 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java @@ -99,7 +99,7 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF loginVO.convertToLoginVO(userUsrVO); // 조직id명 설정 XitOrgnztInfoVO orgnztInfoVO = new XitOrgnztInfoVO(); - orgnztInfoVO.setOrgnztId(userUsrVO.getOrgnztId()); + orgnztInfoVO.setOrgId(userUsrVO.getOrgId()); orgnztInfoVO = xitFrameCrudService.findXitOrgnztInfo(orgnztInfoVO); if (XitCmmnUtil.notEmpty(orgnztInfoVO)) loginVO.setOrgnztNm(orgnztInfoVO.getOrgnztNm()); 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 a6327f7c..16e90870 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 @@ -50,7 +50,7 @@ public class XitSessionMapping extends EgovUsersByUsernameMapping { String strUserNm = rs.getString("user_nm"); String strUserSe = rs.getString("user_se"); String strUserEmail = rs.getString("user_email"); - String strOrgnztId = rs.getString("orgnzt_id"); + String strOrgId = rs.getString("org_id"); String strGroupId = rs.getString("group_id"); String strPstinstCode = rs.getString("pstinst_code"); String strOrgnztNm = rs.getString("orgnzt_nm"); @@ -71,7 +71,7 @@ public class XitSessionMapping extends EgovUsersByUsernameMapping { loginVO.setName(strUserNm); //이름 loginVO.setUserSe(strUserSe); //사용자구분 loginVO.setEmail(strUserEmail); //이메일주소 - loginVO.setOrgnztId(strOrgnztId); //조직(부서)ID - (시스템코드-sysSeCd) + loginVO.setOrgId(strOrgId); //조직(부서)ID - (시스템코드-sysSeCd) loginVO.setOrgnztNm(strOrgnztNm); //조직(부서)ID 명 loginVO.setUniqId(strUniqId); //고유아이디 loginVO.setGroupId(strGroupId); //그룹 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 a2b810d7..b7fe642c 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 @@ -124,7 +124,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("orgnztId_result" , xitFrameCodeService.findOrgnztCodes("XIT_ORGNZT_INFO")); //조직정보코드 목록 + model.addAttribute("orgId_result" , xitFrameCodeService.findOrgnztCodes("XIT_ORGNZT_INFO")); //조직정보코드 목록 model.addAttribute("groupId_result" , xitFrameCodeService.findGroupCodes("XIT_ORGNZT_INFO")); //그룹정보코드 목록 break; @@ -147,7 +147,7 @@ public class XitFrameAnonymousController extends AbstractController { // //업무사용자 // model.addAttribute("userSttusCode_result" , userSttus_result); //사용자상태코드 목록 // model.addAttribute("pstinstCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT025")); //소속기관코드 목록 -// model.addAttribute("orgnztId_result" , xitFrameCodeService.findOrgnztCodes("XIT_ORGNZT_INFO")); //조직정보코드 목록 +// model.addAttribute("orgId_result" , xitFrameCodeService.findOrgnztCodes("XIT_ORGNZT_INFO")); //조직정보코드 목록 break; default: @@ -186,7 +186,7 @@ public class XitFrameAnonymousController extends AbstractController { model.addAttribute("groupId_result" , xitFrameCodeService.findGroupCodes("XIT_ORGNZT_INFO")); //그룹정보코드 목록 model.addAttribute("userSttusCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT013")); //사용자상태코드 목록 model.addAttribute("pstinstCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT025")); //소속기관코드 목록 - model.addAttribute("orgnztId_result" , xitFrameCodeService.findOrgnztCodes("XIT_ORGNZT_INFO")); //조직정보코드 목록 + model.addAttribute("orgId_result" , xitFrameCodeService.findOrgnztCodes("XIT_ORGNZT_INFO")); //조직정보코드 목록 break; default: diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitMainController.java b/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitMainController.java index ac38870b..7a843c13 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitMainController.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitMainController.java @@ -78,7 +78,7 @@ public class XitMainController extends AbstractController { // menuManageVO.setTmp_UserSe(user.getUserSe()); // menuManageVO.setTmp_Name(user.getName()); // menuManageVO.setTmp_Email(user.getEmail()); -// menuManageVO.setTmp_OrgnztId(user.getOrgnztId()); +// menuManageVO.setTmp_OrgId(user.getOrgId()); // menuManageVO.setTmp_UniqId(user.getUniqId()); model.addAttribute("list_headmenu", xitMainService.findMainMenuHeads(user.getUniqId())); model.addAttribute("list_menulist", xitMainService.findtMainMenuLefts(user.getUniqId())); diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/menu/MenuListMngVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/menu/MenuListMngVO.java index 9941ee45..6160cb77 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/menu/MenuListMngVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/menu/MenuListMngVO.java @@ -59,8 +59,8 @@ public class MenuListMngVO { private String tmp_UserSe; /** tmp_Email */ private String tmp_Email; - /** tmp_OrgnztId */ - private String tmp_OrgnztId; + /** tmp_OrgId */ + private String tmp_OrgId; /** tmp_UniqId */ private String tmp_UniqId; /** tmp_Cmd */ @@ -278,18 +278,18 @@ public class MenuListMngVO { this.tmp_Email = tmp_Email; } /** - * tmp_OrgnztId attribute를 리턴한다. + * tmp_OrgId attribute를 리턴한다. * @return String */ - public String getTmp_OrgnztId() { - return tmp_OrgnztId; + public String getTmp_OrgId() { + return tmp_OrgId; } /** - * tmp_OrgnztId attribute 값을 설정한다. - * @param tmp_OrgnztId String + * tmp_OrgId attribute 값을 설정한다. + * @param tmp_OrgId String */ - public void setTmp_OrgnztId(String tmp_OrgnztId) { - this.tmp_OrgnztId = tmp_OrgnztId; + public void setTmp_OrgId(String tmp_OrgId) { + this.tmp_OrgId = tmp_OrgId; } /** * tmp_UniqId attribute를 리턴한다. 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 5fd931e3..9b6a06a1 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 @@ -25,7 +25,7 @@ public class XitUserInfoVO extends XitUserEtcOptionVO { private static final long serialVersionUID = -4545167436366021662L; // protected String user_id; //사용자 id - protected String orgnztId; //조직 id + protected String orgId; //조직 id protected String userNm; //사용자 명 protected String password; //비밀번호 protected String password2; //비밀번호 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 06fe97ea..71a41e0c 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 @@ -107,7 +107,7 @@ public class XitUserRegMngVO extends BaseVO { /** * 조직 ID */ - private String orgnztId; + private String orgId; /** * 비밀번호 */ 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 fb570b9a..16409236 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 @@ -251,7 +251,7 @@ public class UserMgtServiceBean extends AbstractServiceBean implements UserMgtSe return true; break; case "ORGNZT": //자신이 속한 조직의 모든 사용자 - if(loginSessionVO.getOrgnztId().equals(tgtUserVO.getOrgnztId())) + if(loginSessionVO.getOrgId().equals(tgtUserVO.getOrgId())) return true; break; default: diff --git a/src/main/java/kr/xit/fims/framework/core/XitMenuManageVO.java b/src/main/java/kr/xit/fims/framework/core/XitMenuManageVO.java index d609e775..d054354b 100644 --- a/src/main/java/kr/xit/fims/framework/core/XitMenuManageVO.java +++ b/src/main/java/kr/xit/fims/framework/core/XitMenuManageVO.java @@ -65,8 +65,8 @@ public class XitMenuManageVO { private String tmpUserSe; /** tmp_Email */ private String tmpEmail; - /** tmp_OrgnztId */ - private String tmpOrgnztId; + /** tmp_OrgId */ + private String tmpOrgId; /** tmp_UniqId */ private String tmpUniqId; /** tmp_Cmd */ 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 90ac35ab..af627255 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 @@ -101,7 +101,7 @@ comUssUmt.deptUserManageRegistBtn.idSearch=Search Duplicate ID comUssUmt.deptUserManageRegist.crtfcDnValue=User DN comUssUmt.deptUserManageRegist.pstinstCode=Organization Code -comUssUmt.deptUserManageRegist.orgnztId=Organization ID +comUssUmt.deptUserManageRegist.orgId=Organization ID comUssUmt.deptUserManageRegist.ofcps=Position comUssUmt.deptUserManageRegist.emplNum=Employee Number comUssUmt.deptUserManageRegist.brthdy=Birthday 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 e8bdaaa3..afc18fa6 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 @@ -101,7 +101,7 @@ comUssUmt.deptUserManageRegistBtn.idSearch=\uC911\uBCF5\uC544\uC774\uB514 \uAC80 comUssUmt.deptUserManageRegist.crtfcDnValue=\uC0AC\uC6A9\uC790DN comUssUmt.deptUserManageRegist.pstinstCode=\uC18C\uC18D\uAE30\uAD00\uCF54\uB4DC -comUssUmt.deptUserManageRegist.orgnztId=\uC870\uC9C1\uC544\uC774\uB514 +comUssUmt.deptUserManageRegist.orgId=\uC870\uC9C1\uC544\uC774\uB514 comUssUmt.deptUserManageRegist.ofcps=\uC9C1\uC704 comUssUmt.deptUserManageRegist.emplNum=\uC0AC\uBC88 comUssUmt.deptUserManageRegist.brthdy=\uC0DD\uC77C diff --git a/src/main/resources/spring/service/context-idgen-xit.xml b/src/main/resources/spring/service/context-idgen-xit.xml index 2f7d923a..24a14095 100644 --- a/src/main/resources/spring/service/context-idgen-xit.xml +++ b/src/main/resources/spring/service/context-idgen-xit.xml @@ -133,7 +133,7 @@ - + diff --git a/src/main/resources/spring/service/context-security.xml b/src/main/resources/spring/service/context-security.xml index d99e2ad7..f068c978 100644 --- a/src/main/resources/spring/service/context-security.xml +++ b/src/main/resources/spring/service/context-security.xml @@ -50,7 +50,7 @@ - + @@ -117,7 +117,7 @@ , USER_ADRES , USER_EMAIL , USER_SE - , ORGNZT_ID + , ORG_ID , ESNTL_ID , GROUP_ID , PSTINST_CODE diff --git a/src/main/resources/sql/mapper/framework/cache/cachecode-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cache/cachecode-mysql-mapper.xml index 5971e57e..db3117f0 100644 --- a/src/main/resources/sql/mapper/framework/cache/cachecode-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cache/cachecode-mysql-mapper.xml @@ -25,7 +25,7 @@ /* 조직 코드 */ - SELECT orgnzt_id AS code + SELECT org_id AS code , orgnzt_nm AS code_val FROM xit_orgnzt_info diff --git a/src/main/resources/sql/mapper/framework/cmm/XitFrameCode-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cmm/XitFrameCode-mysql-mapper.xml index 1749688d..d7ecff93 100644 --- a/src/main/resources/sql/mapper/framework/cmm/XitFrameCode-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cmm/XitFrameCode-mysql-mapper.xml @@ -58,13 +58,13 @@ /** 조직코드 목록 조회 */ SELECT #{tableNm} AS "grpId" - ,ORGNZT_ID AS "code" + ,ORG_ID AS "code" ,ORGNZT_NM AS "codeVal" ,DSCRP AS "dscrp" FROM XIT_ORGNZT_INFO WHERE 1=1 - - AND ORGNZT_ID LIKE #{orgnztId} + + AND ORG_ID LIKE #{orgId} 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 5a16a1ad..85f6af78 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 @@ -1464,34 +1464,34 @@ /** addXitOrgnztInfo */ /** 조직정보 등록 */ INSERT INTO XIT_ORGNZT_INFO( - ORGNZT_ID + ORG_ID ,ORGNZT_NM ,DSCRP )VALUES( - #{orgnzt_id } + #{org_id } ,#{orgnzt_nm} ,#{dscrp} ) @@ -1504,14 +1504,14 @@ ORGNZT_NM = IFNULL(#{orgnztNm}, ORGNZT_NM) ,DSCRP = #{dscrp} WHERE 1=1 - AND ORGNZT_ID = #{orgnztId} + AND ORG_ID = #{orgId} /** removeXitOrgnztInfo */ /** 조직정보 삭제 */ DELETE FROM XIT_ORGNZT_INFO WHERE 1=1 - AND ORGNZT_ID = #{orgnztId} + AND ORG_ID = #{orgId} @@ -2067,7 +2067,7 @@ /** 사용자정보변경내역 다건 조회 */ SELECT USER_ID ,CHANGE_DE - ,ORGNZT_ID + ,ORG_ID ,GROUP_ID ,EMPL_NO ,SEXDSTN_CODE @@ -2087,7 +2087,7 @@ WHERE 1=1 AND USER_ID = #{user_id } AND CHANGE_DE = #{change_de } - AND ORGNZT_ID = #{orgnzt_id } + AND ORG_ID = #{org_id } AND GROUP_ID = #{group_id } AND EMPL_NO = #{empl_no } AND SEXDSTN_CODE = #{sexdstn_code } @@ -2109,7 +2109,7 @@ /** 사용자정보변경내역 조회 */ SELECT USER_ID ,CHANGE_DE - ,ORGNZT_ID + ,ORG_ID ,GROUP_ID ,EMPL_NO ,SEXDSTN_CODE @@ -2136,7 +2136,7 @@ INSERT INTO XIT_USER_INFO_CHANGE_DTLS( USER_ID ,CHANGE_DE - ,ORGNZT_ID + ,ORG_ID ,GROUP_ID ,EMPL_NO ,SEXDSTN_CODE @@ -2155,7 +2155,7 @@ )VALUES( #{user_id } ,DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') - ,#{orgnzt_id } + ,#{org_id } ,#{group_id } ,#{empl_no } ,#{sexdstn_code } @@ -2179,7 +2179,7 @@ UPDATE XIT_USER_INFO_CHANGE_DTLS SET CHANGE_DE = DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') - ,ORGNZT_ID = #{orgnzt_id } + ,ORG_ID = #{org_id } ,GROUP_ID = #{group_id } ,EMPL_NO = #{empl_no } ,SEXDSTN_CODE = #{sexdstn_code } @@ -2222,7 +2222,7 @@ /** findXitUserInfos */ /** 사용자정보 다건 조회 */ SELECT USER_ID - ,ORGNZT_ID + ,ORG_ID ,USER_NM ,PASSWORD ,EMPL_NO @@ -2248,7 +2248,7 @@ FROM XIT_USER_INFO WHERE 1=1 AND USER_ID = #{user_id } - AND ORGNZT_ID = #{orgnzt_id } + AND ORG_ID = #{org_id } AND USER_NM = #{user_nm } AND PASSWORD = #{password } AND EMPL_NO = #{empl_no } @@ -2275,7 +2275,7 @@ /** findXitUserInfo */ /** 사용자정보 조회 */ SELECT USER_ID - ,ORGNZT_ID + ,ORG_ID ,USER_NM ,PASSWORD ,EMPL_NO @@ -2308,7 +2308,7 @@ INSERT INTO xit_user_info( user_id - , orgnzt_id + , org_id , user_nm , password , empl_no @@ -2333,7 +2333,7 @@ , REG_DT ) VALUES ( #{userId} - , #{orgnztId} + , #{orgId} , #{userNm} , #{password} , #{emplNo} @@ -2364,7 +2364,7 @@ UPDATE XIT_USER_INFO SET REG_DT = REG_DT - ,ORGNZT_ID = #{orgnzt_id } + ,ORG_ID = #{org_id } ,USER_NM = #{user_nm } ,PASSWORD = #{password } ,EMPL_NO = #{empl_no } @@ -2400,7 +2400,7 @@ /** findsXitUserInfoWithEtcOption */ /** 사용자의 정보 및 기타옵션 정보 목록 조회 */ SELECT A.USER_ID - ,A.ORGNZT_ID + ,A.ORG_ID ,A.USER_NM ,A.PASSWORD ,A.EMPL_NO @@ -2431,7 +2431,7 @@ LEFT JOIN XIT_USER_ETC_OPTION B ON A.USER_ID=B.USER_ID WHERE 1=1 AND A.USER_ID = #{user_id } - AND A.ORGNZT_ID = #{orgnzt_id } + AND A.ORG_ID = #{org_id } AND A.USER_NM = #{user_nm } AND A.PASSWORD = #{password } AND A.EMPL_NO = #{empl_no } @@ -2462,7 +2462,7 @@ /** findXitUserInfoWithEtcOption */ /** 사용자의 정보 및 기타옵션 정보 조회 */ SELECT A.USER_ID - ,A.ORGNZT_ID + ,A.ORG_ID ,A.USER_NM ,A.PASSWORD ,A.EMPL_NO 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 f43a540f..f46ec0c4 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 @@ -93,7 +93,7 @@ ,A.EMAIL_ADRES AS "emailAdres" ,A.OFCPS_NM AS "ofcpsNm" ,A.GROUP_ID AS "groupId" - ,A.ORGNZT_ID AS "orgnztId" + ,A.ORG_ID AS "orgId" ,A.PSTINST_CODE AS "pstinstCode" ,A.USER_STTUS_CODE AS "userSttusCode" ,A.REG_DT AS "regDt" 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 46114dc3..6c5ed08f 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 @@ -58,7 +58,7 @@ , email_adres , ofcps_nm , group_id - , orgnzt_id + , org_id , pstinst_code , user_sttus_code , REG_DT @@ -72,7 +72,7 @@ INSERT INTO xit_user_info( user_id - , orgnzt_id + , org_id , user_nm , password , empl_no @@ -97,7 +97,7 @@ , REG_DT ) VALUES ( #{userId} - , #{orgnztId} + , #{orgId} , #{userNm} , #{password} , #{emplNo} @@ -127,7 +127,7 @@ /* user-mysql-mapper|updateUserInfo-사용자정보 변경|julim */ UPDATE xit_user_info - orgnzt_id = IF(orgnzt_id = #{orgnztId}, orgnzt_id, #{orgnztId}) + org_id = IF(org_id = #{orgId}, org_id, #{orgId}) , user_nm = IF(user_nm = #{userNm}, user_nm, #{userNm}) , empl_no = IF(empl_no = #{emplNo}, empl_no, #{emplNo}) , sexdstn_code = IF(sexdstn_code = #{sexdstnCode}, sexdstn_code, #{sexdstnCode}) @@ -159,7 +159,7 @@ 전체 diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtAnswerTargetDataForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtAnswerTargetDataForm.jsp index 2258c618..b73dd286 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtAnswerTargetDataForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtAnswerTargetDataForm.jsp @@ -40,7 +40,7 @@
-
diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtAnswerWaitDataForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtAnswerWaitDataForm.jsp index 0a307c7e..985405b6 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtAnswerWaitDataForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtAnswerWaitDataForm.jsp @@ -40,7 +40,7 @@
-
diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp index 136bc93c..9f0a4fb2 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp @@ -42,7 +42,7 @@
-
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 52a5cc18..603ef9c9 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 @@ -211,11 +211,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 5037933d..adf854c3 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 @@ -105,14 +105,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 def9161e..3ead5e60 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 @@ -156,11 +156,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 d4b5d1dc..d0c51582 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 @@ -105,11 +105,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 01dfbed4..7a1890d5 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 @@ -215,11 +215,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 16ceb38b..ce949991 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 @@ -103,8 +103,8 @@ - - + +