From 802346a1e0a883471a4c46258916e637d5509ba9 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 2 Jun 2023 14:36:06 +0900 Subject: [PATCH] =?UTF-8?q?refactor=20:=20=EC=9C=A0=EC=A0=80=20=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 --- .../fims/framework/biz/cmm/XitLoginVO.java | 4 +- .../biz/cmm/XitUserInfoChangeDtlsVO.java | 10 ++-- .../biz/cmm/service/XitFrameCodeService.java | 4 +- .../biz/cmm/service/XitFrameUnitService.java | 4 +- .../service/bean/XitFrameCodeServiceBean.java | 6 +-- .../service/bean/XitFrameCrudServiceBean.java | 10 ++-- .../service/bean/XitFrameUnitServiceBean.java | 8 ++-- .../cmm/service/bean/XitSessionMapping.java | 4 +- .../cmm/web/XitFrameAnonymousController.java | 6 +-- .../biz/mng/auth/XitAuthGrpMngVO.java | 16 +++---- .../biz/mng/auth/XitAuthUsrMngVO.java | 2 +- .../biz/mng/auth/XitAuthorGroupInfoVO.java | 2 +- .../biz/mng/auth/dao/AuthGrpMgtMapper.java | 2 +- .../bean/AuthByUserMgtServiceBean.java | 2 +- .../service/bean/AuthGrpMgtServiceBean.java | 6 +-- .../mng/auth/web/AuthGrpMgtController.java | 6 +-- .../framework/biz/mng/user/XitUserInfoVO.java | 2 +- .../biz/mng/user/XitUserRegMngVO.java | 2 +- .../biz/mng/user/service/UserMgtService.java | 2 +- .../user/service/bean/UserMgtServiceBean.java | 14 +++--- .../spring/service/context-idgen-xit.xml | 2 +- .../spring/service/context-security.xml | 2 +- .../cache/cachecode-mysql-mapper.xml | 4 +- .../cmm/XitFrameCode-mysql-mapper.xml | 6 +-- .../cmm/XitFrameCrud-mysql-mapper.xml | 46 +++++++++---------- .../mng/admin/XitAdminDbMng-mysql-mapper.xml | 2 +- .../mng/auth/auth-by-user-mysql-mapper.xml | 8 ++-- .../mng/auth/auth-grp-mysql-mapper.xml | 14 +++--- .../mng/usr/XitUserEtcOptMng-mysql-mapper.xml | 4 +- .../framework/mng/usr/user-mysql-mapper.xml | 24 +++++----- .../framework/mng/usr/XitUserRegMng.xml | 2 +- .../biz/cmm/anonymous/XitUserReg_input.jsp | 6 +-- .../biz/cmm/anonymous/forms/UserForm.jsp | 8 ++-- .../biz/mng/admin/mngConectionLogMgtForm.jsp | 4 +- .../mng/auth/backup/XitAuthGrpMng_edit.jsp | 6 +-- .../mng/auth/backup/XitAuthGrpMng_input.jsp | 6 +-- .../mng/auth/backup/XitAuthGrpMng_list.jsp | 14 +++--- .../mng/auth/backup/XitAuthGrpMng_list2.jsp | 16 +++---- .../XitAuthUsrMng_groupsearch_popup.jsp | 10 ++-- .../mng/auth/backup/XitAuthUsrMng_list.jsp | 10 ++-- .../biz/mng/auth/mngAuthByUserMgtForm.jsp | 8 ++-- .../biz/mng/auth/mngAuthGrpMgtForm.jsp | 4 +- .../biz/mng/auth/mngAuthGrpMgtPopup.jsp | 6 +-- .../biz/mng/auth/mngAuthHierarchyMgtPopup.jsp | 2 +- .../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 +- 48 files changed, 174 insertions(+), 174 deletions(-) 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 94c1bf89..dc5e220b 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 @@ -51,7 +51,7 @@ public class XitLoginVO implements Serializable{ /** * 그룹 ID * */ - private String groupId; + private String grpId; /** * 소속기관 코드 - 업무그룹(sgg_cd) @@ -91,7 +91,7 @@ public class XitLoginVO implements Serializable{ this.userSe = USER_SE.USR.name(); this.orgId = vo.getOrgId(); this.orgnztNm = vo.getOrgnztNm(); - this.groupId = vo.getGroupId(); + this.grpId = vo.getGrpId(); this.pstinstCode = vo.getPstinstCode(); this.uniqId = vo.getEsntlId(); this.jobDataAuthor = vo.getJobDataAuthor(); 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 425aa038..9890747a 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 @@ -21,7 +21,7 @@ public class XitUserInfoChangeDtlsVO extends BaseVO { protected String user_id; //사용자 id protected String change_de; //변경 일 protected String org_id; //조직 id - protected String group_id; //그룹 id + protected String grp_id; //그룹 id protected String empl_no; //사원 번호 protected String sexdstn_code; //성별 코드 protected String brthdy; //생일 @@ -57,11 +57,11 @@ public class XitUserInfoChangeDtlsVO extends BaseVO { public void setOrg_id(String org_id) { this.org_id = org_id; } - public String getGroup_id() { - return group_id; + public String getGrp_id() { + return grp_id; } - public void setGroup_id(String group_id) { - this.group_id = group_id; + public void setGrp_id(String grp_id) { + this.grp_id = grp_id; } public String getEmpl_no() { return empl_no; 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 8fc35a24..d76cbb04 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 @@ -70,12 +70,12 @@ public interface XitFrameCodeService { /** * 
메소드 설명: 그룹코드 조회
* @param tableNm 테이블명 - * @param groupId 그룹ID + * @param grpId 그룹ID * @return Map 요청처리 후 응답객체 * @author: 박민규 * @date: 2020. 4. 8. */ - public XitCodeVO findGroupCode(String tableNm, String groupId); + public XitCodeVO findGroupCode(String tableNm, String grpId); /** * 
메소드 설명: 그룹코드 목록 조회
* @param tableNm 테이블명 diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/service/XitFrameUnitService.java b/src/main/java/kr/xit/fims/framework/biz/cmm/service/XitFrameUnitService.java index d0511fd0..3b65667c 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/service/XitFrameUnitService.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/service/XitFrameUnitService.java @@ -278,12 +278,12 @@ public interface XitFrameUnitService { * -그룹의 권한코드 설정 값이 빈(Empty) 값이면 "일반사용자(ROLE_USER)" 권한 반환 * -그룹의 권한코드 설정 값이 있으면 해당 권한코드 반환 * - * @param groupId 그룹 ID + * @param grpId 그룹 ID * @return String 요청처리 후 응답객체 * @author: 박민규 * @date: 2020. 10. 30. */ - public String getDefaultAuthorCode(String groupId); + public String getDefaultAuthorCode(String grpId); 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 cacacfa2..0bd7f03c 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 @@ -160,13 +160,13 @@ public class XitFrameCodeServiceBean extends AbstractServiceBean implements XitF } @Override - public XitCodeVO findGroupCode(String tableNm, String groupId) { + public XitCodeVO findGroupCode(String tableNm, String grpId) { /** * 필수값 확인 */ if(XitCmmnUtil.isEmpty(tableNm)) throw new RuntimeException("테이블명(은)는 필수조건 입니다."); - if(XitCmmnUtil.isEmpty(groupId)) + if(XitCmmnUtil.isEmpty(grpId)) throw new RuntimeException("그룹ID(은)는 필수조건 입니다."); /** @@ -174,7 +174,7 @@ public class XitFrameCodeServiceBean extends AbstractServiceBean implements XitF */ Map m = new HashMap(); m.put("tableNm", tableNm); - m.put("groupId", groupId); + m.put("grpId", grpId); /** * 처리 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 3a871720..19979276 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 @@ -39,7 +39,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF // * 필수조건 확인 // */ // String emsg = null; -// if(XitCmmnUtil.isEmpty(vo.getGroup_id())) +// if(XitCmmnUtil.isEmpty(vo.getGrp_id())) // emsg = String.format("(%s)그룹ID(은)는 필수조건 입니다.", table); // if(emsg!=null){ // logger.error(emsg); @@ -70,7 +70,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getGroupId())) + if(XitCmmnUtil.isEmpty(vo.getGrpId())) emsg = String.format("(%s)그룹ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -101,7 +101,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getGroupId())) + if(XitCmmnUtil.isEmpty(vo.getGrpId())) emsg = String.format("(%s)그룹ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -134,7 +134,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getGroupId())) + if(XitCmmnUtil.isEmpty(vo.getGrpId())) emsg = String.format("(%s)그룹ID(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -167,7 +167,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getGroupId())) + if(XitCmmnUtil.isEmpty(vo.getGrpId())) 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 d9dc3390..f63b378c 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 @@ -464,19 +464,19 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF * -그룹의 권한코드 설정 값이 있으면 해당 권한코드 반환 * * - * @param groupId 그룹 ID + * @param grpId 그룹 ID * @return String 요청처리 후 응답객체 * @author: 박민규 * @date: 2020. 10. 30. */ @Override - public String getDefaultAuthorCode(String groupId) { - if (XitCmmnUtil.isEmpty(groupId)) + public String getDefaultAuthorCode(String grpId) { + if (XitCmmnUtil.isEmpty(grpId)) return "ROLE_USER"; // 그룹의 권한 조회 XitAuthorGroupInfoVO groupInfo = new XitAuthorGroupInfoVO(); - groupInfo.setGroupId(groupId); + groupInfo.setGrpId(grpId); groupInfo = xitFrameCrudService.findXitAuthorGroupInfo(groupInfo); // 권한 설정 if (XitCmmnUtil.isEmpty(groupInfo)) 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 16e90870..31f2df48 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 @@ -51,7 +51,7 @@ public class XitSessionMapping extends EgovUsersByUsernameMapping { String strUserSe = rs.getString("user_se"); String strUserEmail = rs.getString("user_email"); String strOrgId = rs.getString("org_id"); - String strGroupId = rs.getString("group_id"); + String strGrpId = rs.getString("grp_id"); String strPstinstCode = rs.getString("pstinst_code"); String strOrgnztNm = rs.getString("orgnzt_nm"); String strUniqId = rs.getString("esntl_id"); @@ -74,7 +74,7 @@ public class XitSessionMapping extends EgovUsersByUsernameMapping { loginVO.setOrgId(strOrgId); //조직(부서)ID - (시스템코드-sysSeCd) loginVO.setOrgnztNm(strOrgnztNm); //조직(부서)ID 명 loginVO.setUniqId(strUniqId); //고유아이디 - loginVO.setGroupId(strGroupId); //그룹 + loginVO.setGrpId(strGrpId); //그룹 loginVO.setPstinstCode(strPstinstCode); //소속기관-업무그룹(sgg_cd) loginVO.setJobDataAuthor(strJobDataAuthor); //업무 데이터 권한 loginVO.setUserManageAuthor(strUserManageAuthor); //사용자 관리 권한 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 b7fe642c..20ca4558 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 @@ -125,7 +125,7 @@ public class XitFrameAnonymousController extends AbstractController { model.addAttribute("sexdstnCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT014")); //성별구분코드 목록 model.addAttribute("pstinstCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT025")); //소속기관코드 목록 model.addAttribute("orgId_result" , xitFrameCodeService.findOrgnztCodes("XIT_ORGNZT_INFO")); //조직정보코드 목록 - model.addAttribute("groupId_result" , xitFrameCodeService.findGroupCodes("XIT_ORGNZT_INFO")); //그룹정보코드 목록 + model.addAttribute("grpId_result" , xitFrameCodeService.findGroupCodes("XIT_ORGNZT_INFO")); //그룹정보코드 목록 break; case "inputEvr": //(일반/기업/업무사용자) 회원가입 페이지 @@ -135,7 +135,7 @@ public class XitFrameAnonymousController extends AbstractController { // //모든 사용자 공통 // model.addAttribute("passwordHint_result" , xitFrameCodeService.findCmmnDetailCodes("XIT022")); //패스워트힌트코드 목록 // model.addAttribute("sexdstnCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT014")); //성별구분코드 목록 -// model.addAttribute("groupId_result" , xitFrameCodeService.findGroupCodes("XIT_ORGNZT_INFO")); //그룹정보코드 목록 +// model.addAttribute("grpId_result" , xitFrameCodeService.findGroupCodes("XIT_ORGNZT_INFO")); //그룹정보코드 목록 // List userSttus_result = xitFrameCodeService.findCmmnDetailCodes("XIT013"); // // //일반회원 @@ -183,7 +183,7 @@ public class XitFrameAnonymousController extends AbstractController { ================*/ model.addAttribute("passwordHint_result" , xitFrameCodeService.findCmmnDetailCodes("XIT022")); //패스워트힌트코드 목록 model.addAttribute("sexdstnCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT014")); //성별구분코드 목록 - model.addAttribute("groupId_result" , xitFrameCodeService.findGroupCodes("XIT_ORGNZT_INFO")); //그룹정보코드 목록 + 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("orgId_result" , xitFrameCodeService.findOrgnztCodes("XIT_ORGNZT_INFO")); //조직정보코드 목록 diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/auth/XitAuthGrpMngVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/auth/XitAuthGrpMngVO.java index 79e249da..6d13e6d5 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/auth/XitAuthGrpMngVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/auth/XitAuthGrpMngVO.java @@ -25,7 +25,7 @@ public class XitAuthGrpMngVO extends BaseVO { /** * 그룹 ID */ - private String groupId; + private String grpId; /** * 그룹명 */ @@ -62,18 +62,18 @@ public class XitAuthGrpMngVO extends BaseVO { this.groupManage = groupManage; } /** - * groupId attribute 를 리턴한다. + * grpId attribute 를 리턴한다. * @return String */ - public String getGroupId() { - return groupId; + public String getGrpId() { + return grpId; } /** - * groupId attribute 값을 설정한다. - * @param groupId String + * grpId attribute 값을 설정한다. + * @param grpId String */ - public void setGroupId(String groupId) { - this.groupId = groupId; + public void setGrpId(String grpId) { + this.grpId = grpId; } /** * groupNm attribute 를 리턴한다. diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/auth/XitAuthUsrMngVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/auth/XitAuthUsrMngVO.java index 044f43dd..52abbed8 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/auth/XitAuthUsrMngVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/auth/XitAuthUsrMngVO.java @@ -39,7 +39,7 @@ public class XitAuthUsrMngVO { /** * 설정대상 그룹 ID */ - private String groupId; + private String grpId; /** * 설정대상 사용자 유형 코드 */ diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/auth/XitAuthorGroupInfoVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/auth/XitAuthorGroupInfoVO.java index 3225a0fe..ee577fec 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/auth/XitAuthorGroupInfoVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/auth/XitAuthorGroupInfoVO.java @@ -21,7 +21,7 @@ import lombok.*; public class XitAuthorGroupInfoVO { private static final long serialVersionUID = -4390096179096398215L; - private String groupId; //그룹 id + private String grpId; //그룹 id private String groupNm; //그룹 명 private String dscrp; //그룹 설명 private String authorCode; //권한 코드 diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/auth/dao/AuthGrpMgtMapper.java b/src/main/java/kr/xit/fims/framework/biz/mng/auth/dao/AuthGrpMgtMapper.java index 531a7c4d..e25db15b 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/auth/dao/AuthGrpMgtMapper.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/auth/dao/AuthGrpMgtMapper.java @@ -24,5 +24,5 @@ public interface AuthGrpMgtMapper { XitAuthorGroupInfoVO selectAuthorGroupInfo(final T t); int insertAuthorGroupInfo(final XitAuthorGroupInfoVO vo); int updateAuthorGroupInfo(final XitAuthorGroupInfoVO vo); - int deleteAuthorGroupInfo(final String groupId); + int deleteAuthorGroupInfo(final String grpId); } diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/auth/service/bean/AuthByUserMgtServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/auth/service/bean/AuthByUserMgtServiceBean.java index 51a81439..133b4d77 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/auth/service/bean/AuthByUserMgtServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/auth/service/bean/AuthByUserMgtServiceBean.java @@ -65,7 +65,7 @@ public class AuthByUserMgtServiceBean extends AbstractServiceBean implements Aut XitUserScrtySetupVO vo = new XitUserScrtySetupVO(); vo.setScrtySetupTrgetId(String.valueOf(map.get("uniqId"))); vo.setMberTyCode(String.valueOf(map.get("mberTyCode"))); - vo.setAuthorCode(userMgtService.getDefaultAuthorCode(String.valueOf(map.get("groupId")))); + vo.setAuthorCode(userMgtService.getDefaultAuthorCode(String.valueOf(map.get("grpId")))); userMapper.updateUserScrtySetup(vo); }); } diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/auth/service/bean/AuthGrpMgtServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/auth/service/bean/AuthGrpMgtServiceBean.java index 7ced4ca4..cb534f0a 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/auth/service/bean/AuthGrpMgtServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/auth/service/bean/AuthGrpMgtServiceBean.java @@ -56,7 +56,7 @@ public class AuthGrpMgtServiceBean extends AbstractServiceBean implements AuthGr this.isCheckUserForCanChange(XitCmmnUtil.getUserInfo().getUniqId(), vo.getAuthorCode()); try { - vo.setGroupId(groupIdGnrService.getNextStringId()); + vo.setGrpId(groupIdGnrService.getNextStringId()); } catch (FdlException e) { throw BizRuntimeException.create(MessageKey.CUSTOM_MSG, e.getMessage()); } @@ -74,8 +74,8 @@ public class AuthGrpMgtServiceBean extends AbstractServiceBean implements AuthGr @Override @Transactional - public void removeAuthGrp(final String groupId) { - mapper.deleteAuthorGroupInfo(groupId); + public void removeAuthGrp(final String grpId) { + mapper.deleteAuthorGroupInfo(grpId); } @Transactional(readOnly = true) diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/auth/web/AuthGrpMgtController.java b/src/main/java/kr/xit/fims/framework/biz/mng/auth/web/AuthGrpMgtController.java index 656b9907..0a8c3394 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/auth/web/AuthGrpMgtController.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/auth/web/AuthGrpMgtController.java @@ -39,7 +39,7 @@ public class AuthGrpMgtController extends AbstractController { public ModelAndView mngAuthAuthorMgtPopup(@ModelAttribute final XitAuthorGroupInfoVO vo){ ModelAndView mav = new ModelAndView(); - if(Checks.isEmpty(vo) || Checks.isEmpty(vo.getGroupId())){ + if(Checks.isEmpty(vo) || Checks.isEmpty(vo.getGrpId())){ mav.addObject("groupManage", new XitAuthorGroupInfoVO()); mav.addObject("pageTitle", "권한그룹 등록"); } else { @@ -80,10 +80,10 @@ public class AuthGrpMgtController extends AbstractController { } @PostMapping(name = "", value = "/removeAuthGrp") - public ModelAndView removeAuthAuthor(final String groupId){ + public ModelAndView removeAuthAuthor(final String grpId){ ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - service.removeAuthGrp(groupId); + service.removeAuthGrp(grpId); AjaxMessageMapRenderer.success(mav, MessageKey.CMM_DELETE_SUCCESS); return mav; } 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 9b6a06a1..96581725 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 @@ -43,7 +43,7 @@ public class XitUserInfoVO extends XitUserEtcOptionVO { protected String mbtlnum; //이동전화번호 protected String emailAdres; //이메일 주소 protected String ofcpsNm; //직위 명 - protected String groupId; //그룹 id - 업무그룹(sgg_cd) + protected String grpId; //그룹 id - 업무그룹(sgg_cd) protected String pstinstCode; //소속기관 코드 - 시스템코드(sysSeCd) protected String userSttusCode; //사용자 상태 코드 protected String esntlId; //고유 id 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 71a41e0c..6ff566b5 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 @@ -79,7 +79,7 @@ public class XitUserRegMngVO extends BaseVO { /** * 그룹 ID */ - private String groupId; + private String grpId; /** * 집 주소 */ diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/service/UserMgtService.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/service/UserMgtService.java index 56481b94..a22e1695 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/service/UserMgtService.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/service/UserMgtService.java @@ -34,7 +34,7 @@ public interface UserMgtService { void modifyUser(final XitUserInfoVO userInfoVO); void removeUser(final String userTy, final String uniqId); - String getDefaultAuthorCode(final String groupId); + String getDefaultAuthorCode(final String grpId); int addUserScrtySetup(final XitUserScrtySetupVO vo); 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 16409236..ca0771a3 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 @@ -80,7 +80,7 @@ public class UserMgtServiceBean extends AbstractServiceBean implements UserMgtSe XitUserScrtySetupVO userScrtySetupVO = new XitUserScrtySetupVO(); userScrtySetupVO.setScrtySetupTrgetId(vo.getEsntlId()); userScrtySetupVO.setMberTyCode("USR03"); - userScrtySetupVO.setAuthorCode(this.getDefaultAuthorCode(vo.getGroupId())); + userScrtySetupVO.setAuthorCode(this.getDefaultAuthorCode(vo.getGrpId())); mapper.insertUserScrtySetup(userScrtySetupVO); // 기타 option @@ -112,10 +112,10 @@ public class UserMgtServiceBean extends AbstractServiceBean implements UserMgtSe mapper.updateUserInfo(vo); //그룹ID가 변경되었을 경우 사용자의 권한 갱신 - if(!Objects.equals(vo.getGroupId(), userInfoCheckMap.get("group_id"))) { + if(!Objects.equals(vo.getGrpId(), userInfoCheckMap.get("grp_id"))) { XitUserScrtySetupVO userScrtySetupVO = new XitUserScrtySetupVO(); userScrtySetupVO.setScrtySetupTrgetId(vo.getUniqId()); - userScrtySetupVO.setAuthorCode(this.getDefaultAuthorCode(vo.getGroupId())); + userScrtySetupVO.setAuthorCode(this.getDefaultAuthorCode(vo.getGrpId())); if(Checks.isEmpty(mapper.selectUserScrtySetup(userScrtySetupVO.getScrtySetupTrgetId()))) { userScrtySetupVO.setMberTyCode("USR03"); @@ -162,17 +162,17 @@ public class UserMgtServiceBean extends AbstractServiceBean implements UserMgtSe * -그룹의 권한코드 설정 값이 있으면 해당 권한코드 반환 * * - * @param groupId 그룹 ID + * @param grpId 그룹 ID * @return String 요청처리 후 응답객체 * @author: 박민규 * @date: 2020. 10. 30. */ @Override @Transactional(readOnly = true) - public String getDefaultAuthorCode(final String groupId) { - if(Checks.isEmpty(groupId)) return "ROLE_USER"; + public String getDefaultAuthorCode(final String grpId) { + if(Checks.isEmpty(grpId)) return "ROLE_USER"; - XitAuthorGroupInfoVO vo = authGrpMgtMapper.selectAuthorGroupInfo(groupId); + XitAuthorGroupInfoVO vo = authGrpMgtMapper.selectAuthorGroupInfo(grpId); // 권한 설정 if (Checks.isEmpty(vo)) return "ROLE_USER"; diff --git a/src/main/resources/spring/service/context-idgen-xit.xml b/src/main/resources/spring/service/context-idgen-xit.xml index 24a14095..0d842260 100644 --- a/src/main/resources/spring/service/context-idgen-xit.xml +++ b/src/main/resources/spring/service/context-idgen-xit.xml @@ -83,7 +83,7 @@ - + diff --git a/src/main/resources/spring/service/context-security.xml b/src/main/resources/spring/service/context-security.xml index f068c978..5a2d8976 100644 --- a/src/main/resources/spring/service/context-security.xml +++ b/src/main/resources/spring/service/context-security.xml @@ -119,7 +119,7 @@ , USER_SE , ORG_ID , ESNTL_ID - , GROUP_ID + , GRP_ID , PSTINST_CODE , ORGNZT_NM , JOB_DATA_AUTHOR 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 db3117f0..56ec4a61 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 @@ -32,7 +32,7 @@ /* 그룹 코드 */ - SELECT group_id AS code + SELECT grp_id AS code , group_nm AS code_val FROM xit_author_group_info @@ -46,7 +46,7 @@ /* 권한 그룹 코드 */ - SELECT group_id AS code + SELECT grp_id AS code , group_nm AS code_val FROM xit_author_group_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 d7ecff93..f9491d89 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 @@ -75,13 +75,13 @@ /** 그룹코드 목록 조회 */ SELECT #{tableNm} AS "grpId" - ,GROUP_ID AS "code" + ,GRP_ID AS "code" ,GROUP_NM AS "codeVal" ,DSCRP AS "dscrp" FROM XIT_AUTHOR_GROUP_INFO WHERE 1=1 - - AND GROUP_ID LIKE #{groupId} + + AND GRP_ID LIKE #{grpId} 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 85f6af78..5b612721 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 @@ -5,14 +5,14 @@ /** findXitAuthorGroupInfo */ /** 권한그룹정보 조회 */ - SELECT GROUP_ID + SELECT GRP_ID ,GROUP_NM ,GROUP_CREAT_DE ,DSCRP ,AUTHOR_CODE FROM XIT_AUTHOR_GROUP_INFO WHERE 1=1 - AND GROUP_ID = #{group_id} + AND GRP_ID = #{grp_id} /** addXitAuthorGroupInfo */ /** 권한그룹정보 등록 */ INSERT INTO XIT_AUTHOR_GROUP_INFO( - GROUP_ID + GRP_ID ,GROUP_NM ,GROUP_CREAT_DE ,DSCRP ,AUTHOR_CODE )VALUES( - #{group_id } + #{grp_id } ,#{group_nm } ,DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') ,#{dscrp } @@ -57,14 +57,14 @@ ,DSCRP = #{dscrp } ,AUTHOR_CODE = #{author_code} WHERE 1=1 - AND GROUP_ID = #{group_id} + AND GRP_ID = #{grp_id} /** removeXitAuthorGroupInfo */ /** 권한그룹정보 삭제 */ DELETE FROM XIT_AUTHOR_GROUP_INFO WHERE 1=1 - AND GROUP_ID = #{group_id} + AND GRP_ID = #{grp_id} @@ -2068,7 +2068,7 @@ SELECT USER_ID ,CHANGE_DE ,ORG_ID - ,GROUP_ID + ,GRP_ID ,EMPL_NO ,SEXDSTN_CODE ,BRTHDY @@ -2088,7 +2088,7 @@ AND USER_ID = #{user_id } AND CHANGE_DE = #{change_de } AND ORG_ID = #{org_id } - AND GROUP_ID = #{group_id } + AND GRP_ID = #{grp_id } AND EMPL_NO = #{empl_no } AND SEXDSTN_CODE = #{sexdstn_code } AND BRTHDY = #{brthdy } @@ -2110,7 +2110,7 @@ SELECT USER_ID ,CHANGE_DE ,ORG_ID - ,GROUP_ID + ,GRP_ID ,EMPL_NO ,SEXDSTN_CODE ,BRTHDY @@ -2137,7 +2137,7 @@ USER_ID ,CHANGE_DE ,ORG_ID - ,GROUP_ID + ,GRP_ID ,EMPL_NO ,SEXDSTN_CODE ,BRTHDY @@ -2156,7 +2156,7 @@ #{user_id } ,DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') ,#{org_id } - ,#{group_id } + ,#{grp_id } ,#{empl_no } ,#{sexdstn_code } ,#{brthdy } @@ -2180,7 +2180,7 @@ SET CHANGE_DE = DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') ,ORG_ID = #{org_id } - ,GROUP_ID = #{group_id } + ,GRP_ID = #{grp_id } ,EMPL_NO = #{empl_no } ,SEXDSTN_CODE = #{sexdstn_code } ,BRTHDY = #{brthdy } @@ -2239,7 +2239,7 @@ ,MBTLNUM ,EMAIL_ADRES ,OFCPS_NM - ,GROUP_ID + ,GRP_ID ,PSTINST_CODE ,USER_STTUS_CODE ,ESNTL_ID @@ -2265,7 +2265,7 @@ AND MBTLNUM = #{mbtlnum } AND EMAIL_ADRES = #{email_adres } AND OFCPS_NM = #{ofcps_nm } - AND GROUP_ID = #{group_id } + AND GRP_ID = #{grp_id } AND PSTINST_CODE = #{pstinst_code } AND USER_STTUS_CODE = #{user_sttus_code } AND ESNTL_ID = #{esntl_id } @@ -2292,7 +2292,7 @@ ,MBTLNUM ,EMAIL_ADRES ,OFCPS_NM - ,GROUP_ID + ,GRP_ID ,PSTINST_CODE ,USER_STTUS_CODE ,ESNTL_ID @@ -2325,7 +2325,7 @@ , mbtlnum , email_adres , ofcps_nm - , group_id + , grp_id , pstinst_code , user_sttus_code , esntl_id @@ -2350,7 +2350,7 @@ , #{mbtlnum} , #{emailAdres} , #{ofcpsNm} - , #{groupId} + , #{grpId} , #{pstinstCode} , #{userSttusCode} , #{esntlId} @@ -2381,7 +2381,7 @@ ,MBTLNUM = #{mbtlnum } ,EMAIL_ADRES = #{email_adres } ,OFCPS_NM = #{ofcps_nm } - ,GROUP_ID = #{group_id } + ,GRP_ID = #{grp_id } ,PSTINST_CODE = #{pstinst_code } ,USER_STTUS_CODE = #{user_sttus_code } ,ESNTL_ID = #{esntl_id } @@ -2417,7 +2417,7 @@ ,A.MBTLNUM ,A.EMAIL_ADRES ,A.OFCPS_NM - ,A.GROUP_ID + ,A.GRP_ID ,A.PSTINST_CODE ,A.USER_STTUS_CODE ,A.ESNTL_ID @@ -2448,7 +2448,7 @@ AND A.MBTLNUM = #{mbtlnum } AND A.EMAIL_ADRES = #{email_adres } AND A.OFCPS_NM = #{ofcps_nm } - AND A.GROUP_ID = #{group_id } + AND A.GRP_ID = #{grp_id } AND A.PSTINST_CODE = #{pstinst_code } AND A.USER_STTUS_CODE = #{user_sttus_code } AND A.ESNTL_ID = #{esntl_id } @@ -2479,7 +2479,7 @@ ,A.MBTLNUM ,A.EMAIL_ADRES ,A.OFCPS_NM - ,A.GROUP_ID + ,A.GRP_ID ,A.PSTINST_CODE ,A.USER_STTUS_CODE ,A.ESNTL_ID diff --git a/src/main/resources/sql/mapper/framework/mng/admin/XitAdminDbMng-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/admin/XitAdminDbMng-mysql-mapper.xml index 4f29c835..d8cdcea5 100644 --- a/src/main/resources/sql/mapper/framework/mng/admin/XitAdminDbMng-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/admin/XitAdminDbMng-mysql-mapper.xml @@ -55,7 +55,7 @@ /** 관리자DB관리 상세정보 조회 */ - WHERE A.GROUP_ID = #{groupId} + WHERE A.GRP_ID = #{grpId} diff --git a/src/main/resources/sql/mapper/framework/mng/auth/auth-by-user-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/auth/auth-by-user-mysql-mapper.xml index 5db31e78..fc0a5ec9 100644 --- a/src/main/resources/sql/mapper/framework/mng/auth/auth-by-user-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/auth/auth-by-user-mysql-mapper.xml @@ -8,7 +8,7 @@ SELECT xui.user_id , xui.user_nm - , xui.group_id + , xui.grp_id , uss.mber_ty_code , cdc.code_val AS mberTyNm , uss.author_code @@ -17,7 +17,7 @@ FROM ( SELECT user_id , user_nm user_nm - , group_id + , grp_id , esntl_id FROM xit_user_info ) xui LEFT OUTER JOIN xit_user_scrty_setup uss @@ -32,8 +32,8 @@ AND INSTR(xui.user_nm, #{userNm}) > 0 - - AND xui.group_id = #{groupId} + + AND xui.grp_id = #{grpId} diff --git a/src/main/resources/sql/mapper/framework/mng/auth/auth-grp-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/auth/auth-grp-mysql-mapper.xml index 7b07f998..f1129941 100644 --- a/src/main/resources/sql/mapper/framework/mng/auth/auth-grp-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/auth/auth-grp-mysql-mapper.xml @@ -7,7 +7,7 @@ ************************************************************************************************************** --> /* auth-grp-mysql-mapper|selectAuthorGroupInfo-권한그룹 정보 조회|julim */ - SELECT group_id + SELECT grp_id , group_nm , dscrp , author_code , group_creat_de FROM xit_author_group_info - WHERE group_id = #{groupId} + WHERE grp_id = #{grpId} /* auth-grp-mysql-mapper|insertAuthorGroupInfo-권한그룹 등록|julim */ INSERT INTO xit_author_group_info( - group_id + grp_id , group_nm , dscrp , author_code , group_creat_de )VALUES( - #{groupId} + #{grpId} , #{groupNm} , #{dscrp} , #{authorCode} @@ -57,14 +57,14 @@ SET group_nm = IF(group_nm = #{groupNm}, group_nm, #{groupNm}) , dscrp = IF(dscrp = #{dscrp}, dscrp, #{dscrp}) , author_code = IF(author_code = #{authorCode}, author_code, #{authorCode}) - WHERE group_id = #{groupId} + WHERE grp_id = #{grpId} /* auth-grp-mysql-mapper|deleteAuthorGroupInfo-권한그룹 삭제|julim */ DELETE FROM xit_author_group_info - WHERE group_id = #{groupId} + WHERE grp_id = #{grpId} 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 f46ec0c4..137cc415 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 @@ -32,7 +32,7 @@ AND A.USER_NM LIKE CONCAT('%',#{searchKeyword},'%') - AND A.GROUP_ID = #{searchKeyword} + AND A.GRP_ID = #{searchKeyword} @@ -92,7 +92,7 @@ ,A.MBTLNUM AS "mbtlnum" ,A.EMAIL_ADRES AS "emailAdres" ,A.OFCPS_NM AS "ofcpsNm" - ,A.GROUP_ID AS "groupId" + ,A.GRP_ID AS "grpId" ,A.ORG_ID AS "orgId" ,A.PSTINST_CODE AS "pstinstCode" ,A.USER_STTUS_CODE AS "userSttusCode" 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 6c5ed08f..0b3bcc44 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 @@ -14,7 +14,7 @@ , xui.email_adres , xui.area_no , xui.mbtlnum - , xui.group_id + , xui.grp_id , xui.user_sttus_code , xui.REG_DT , cdc.code_val AS userSttusCodeNm @@ -57,7 +57,7 @@ , mbtlnum , email_adres , ofcps_nm - , group_id + , grp_id , org_id , pstinst_code , user_sttus_code @@ -89,7 +89,7 @@ , mbtlnum , email_adres , ofcps_nm - , group_id + , grp_id , pstinst_code , user_sttus_code , esntl_id @@ -114,7 +114,7 @@ , #{mbtlnum} , #{emailAdres} , #{ofcpsNm} - , #{groupId} + , #{grpId} , #{pstinstCode} , #{userSttusCode} , #{esntlId} @@ -141,7 +141,7 @@ , mbtlnum = IF(mbtlnum = #{mbtlnum}, mbtlnum, #{mbtlnum}) , email_adres = IF(email_adres = #{emailAdres}, email_adres, #{emailAdres}) , ofcps_nm = IF(ofcps_nm = #{ofcpsNm}, ofcps_nm, #{ofcpsNm}) - , group_id = IF(group_id = #{groupId}, group_id, #{groupId}) + , grp_id = IF(grp_id = #{grpId}, grp_id, #{grpId}) , pstinst_code = IF(pstinst_code = #{pstinstCode}, pstinst_code, #{pstinstCode}) , user_sttus_code = IF(user_sttus_code = #{userSttusCode}, user_sttus_code, #{userSttusCode}) , crtfc_dn_value = IF(crtfc_dn_value = #{crtfcDnValue}, crtfc_dn_value, #{crtfcDnValue}) @@ -157,10 +157,10 @@ /* user-mysql-mapper|selectAuthorGroupInfo-권한그룹정보 조회|julim */ - SELECT group_id + SELECT grp_id , group_nm , group_creat_de , dscrp , author_code FROM xit_author_group_info - - AND group_id = #{groupId} + + AND grp_id = #{grpId} AND group_nm = #{groupNm} @@ -356,7 +356,7 @@ user_id , change_de , org_id - , group_id + , grp_id , empl_no , sexdstn_code , brthdy @@ -374,7 +374,7 @@ ) SELECT user_id , DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') , org_id - , group_id + , grp_id , empl_no , sexdstn_code , brthdy diff --git a/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml b/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml index 2b6625ae..91614990 100644 --- a/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml +++ b/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml @@ -106,7 +106,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 603ef9c9..f5c2fa67 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 @@ -289,11 +289,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 adf854c3..723e3f85 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 @@ -189,14 +189,14 @@ - + - + - + - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/mngConectionLogMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/mngConectionLogMgtForm.jsp index ea9afcc5..aa4f0dcb 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/mngConectionLogMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/mngConectionLogMgtForm.jsp @@ -115,7 +115,7 @@ getParams: function(){ const schKey = $('#searchCondition').val(); let schValue = $('input[name=searchKeyword]').val(); - if (schKey === 'groupId') + if (schKey === 'grpId') schValue = $('select[name=searchKeyword]').val(); return {[schKey]: schValue}; }, @@ -149,7 +149,7 @@ uniqId: row.uniqId , authorCode: row.authorCode , mberTyCode: row.mberTyCode - , groupId: row.groupId + , grpId: row.grpId , regYn: row.regYn } }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthGrpMng_edit.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthGrpMng_edit.jsp index acebcfa4..0973e0a5 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthGrpMng_edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthGrpMng_edit.jsp @@ -8,8 +8,8 @@ <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> - - + + @@ -25,7 +25,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthGrpMng_input.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthGrpMng_input.jsp index b4b70f9c..5bdcad5c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthGrpMng_input.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthGrpMng_input.jsp @@ -8,8 +8,8 @@ <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> - - + + @@ -25,7 +25,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthGrpMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthGrpMng_list.jsp index fa62d526..d2a5a22e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthGrpMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthGrpMng_list.jsp @@ -6,8 +6,8 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - - + + @@ -105,13 +105,13 @@ var XitAuthGrpMng_list = { alert("선택된 권한이 없습니다."); }else{ checkArr.forEach(function(item, index){ - returnValue += item.groupId; + returnValue += item.grpId; if(checkArr.length -1 > index){ returnValue += ";"; } }) - document.listForm.groupIds.value = returnValue; + document.listForm.grpIds.value = returnValue; XitAuthGrpMng_list.removeData(); } } @@ -205,7 +205,7 @@ var XitAuthGrpMng_list = { fnClickGrpBtn: function(props){ var rowData = props.grid.getRow(props.rowKey); var params = ""; - params += "groupId=" + rowData.groupId; + params += "grpId=" + rowData.grpId; XitAuthGrpMng_list.pagePopup('detail', "", params); } } @@ -272,7 +272,7 @@ GridConfig.setOptHeader({ GridConfig.setOptColumns([ //Grid 컬럼 정보(명칭,매핑 field, 기타옵션 등) { header: '그룹 ID', - name: 'groupId', + name: 'grpId', width: 120, sortable: true, sortingType: 'desc', @@ -283,7 +283,7 @@ GridConfig.setOptColumns([ //Grid 컬럼 정보(명칭,매핑 field, 기타옵 formatter : function(props){ var rowData = props.grid.getRow(props.rowKey); var obj = { - formatter : rowData.groupId + formatter : rowData.grpId ,element : "text" } return obj; diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthGrpMng_list2.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthGrpMng_list2.jsp index 63e0e787..07722776 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthGrpMng_list2.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthGrpMng_list2.jsp @@ -74,7 +74,7 @@ function fncManageChecked() { alert("조회된 결과가 없습니다."); } - document.listForm.groupIds.value = returnValue; + document.listForm.grpIds.value = returnValue; return returnBoolean; } @@ -86,8 +86,8 @@ function fncSelectGroupList(pageNo){ document.listForm.submit(); } -function fncSelectGroup(groupId) { - document.listForm.groupId.value = groupId; +function fncSelectGroup(grpId) { + document.listForm.grpId.value = grpId; document.listForm.action = ""; document.listForm.submit(); } @@ -188,12 +188,12 @@ function press() { - " /> - ')"> + " /> + ')"> - ')">상세조회 + ')">상세조회 @@ -216,8 +216,8 @@ function press() { - - + + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthUsrMng_groupsearch_popup.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthUsrMng_groupsearch_popup.jsp index 242ca3ea..e9a46685 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthUsrMng_groupsearch_popup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthUsrMng_groupsearch_popup.jsp @@ -14,9 +14,9 @@ function fncSelectGroupList(pageNo){ document.listForm.submit(); } -function fncSelectGroup(groupId) { - // window.returnValue = groupId; - opener.listForm.searchKeyword.value = groupId; +function fncSelectGroup(grpId) { + // window.returnValue = grpId; + opener.listForm.searchKeyword.value = grpId; window.close(); } @@ -85,7 +85,7 @@ function press() { - ')"> + ')"> @@ -108,7 +108,7 @@ function press() { - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthUsrMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthUsrMng_list.jsp index 5081f2d7..52678453 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthUsrMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthUsrMng_list.jsp @@ -12,7 +12,7 @@ - +
@@ -213,7 +213,7 @@ var XitAuthUsrMng_list = { var returnAuthor = ""; var returnRegYn = ""; var returnmberTyCode = ""; - var returnGroupId = ""; + var returnGrpId = ""; var returnBoolean = false; @@ -228,14 +228,14 @@ var XitAuthUsrMng_list = { returnAuthor += item.authorCode; returnRegYn += item.regYn; returnmberTyCode += item.mberTyCode; - returnGroupId += item.groupId; + returnGrpId += item.grpId; if(checkArr.length -1 > index){ returnId += ";"; returnAuthor += ";"; returnRegYn += ";"; returnmberTyCode += ";"; - returnGroupId += ";"; + returnGrpId += ";"; } }) @@ -243,7 +243,7 @@ var XitAuthUsrMng_list = { document.listForm.authorCodes.value = returnAuthor; document.listForm.regYns.value = returnRegYn; document.listForm.mberTyCodes.value = returnmberTyCode; - document.listForm.groupIds.value = returnGroupId; + document.listForm.grpIds.value = returnGrpId; } } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthByUserMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthByUserMgtForm.jsp index dbef9012..a0925fcc 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthByUserMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthByUserMgtForm.jsp @@ -22,7 +22,7 @@ @@ -119,7 +119,7 @@ getParams: function(){ const schKey = $('#searchCondition').val(); let schValue = $('input[name=searchKeyword]').val(); - if (schKey === 'groupId') + if (schKey === 'grpId') schValue = $('select[name=searchKeyword]').val(); return {[schKey]: schValue}; }, @@ -176,14 +176,14 @@ uniqId: row.uniqId , authorCode: row.authorCode , mberTyCode: row.mberTyCode - , groupId: row.groupId + , grpId: row.grpId , regYn: row.regYn } }); } ,onSearchChange: () => { - if($('#searchCondition').val() === 'groupId'){ + if($('#searchCondition').val() === 'grpId'){ $('select[name="searchKeyword"]') .css('display', 'inline-block') .attr('disabled', false); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp index 9f98d744..15202099 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp @@ -163,7 +163,7 @@ const gridColumns = [ { header: '그룹 ID', - name: 'groupId', + name: 'grpId', width: 120, sortable: true, sortingType: 'desc', @@ -174,7 +174,7 @@ formatter : function(props){ const rowData = props.grid.getRow(props.rowKey); return { - formatter: rowData.groupId + formatter: rowData.grpId ,element: "text" } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp index 5ffa1c90..f5d41dbf 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp @@ -2,7 +2,7 @@ <%@ include file="/WEB-INF/jsp/include/taglib.jsp" %> <%@ include file="/WEB-INF/jsp/include/fims/taglib.jsp" %> - +
@@ -23,7 +23,7 @@ - + @@ -95,7 +95,7 @@ ,remove: () => { cmmBizAjax('remove', { url: '' - ,data: {groupId: $('#groupId').val()} + ,data: {grpId: $('#grpId').val()} }); } ,validate: () => { diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthHierarchyMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthHierarchyMgtPopup.jsp index 68d724f5..575ed69d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthHierarchyMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthHierarchyMgtPopup.jsp @@ -237,7 +237,7 @@ alert('변경된 내용이 없습니다.'); return false; } - if ($('#groupId').val() === '') { + if ($('#grpId').val() === '') { alert('[권한그룹 ID]는 필수 입니다.'); $('#authorCode').focus(); return false; 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 3ead5e60..5c6dc9c2 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 @@ -243,11 +243,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 d0c51582..16594688 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 @@ -191,11 +191,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 7a1890d5..3f591945 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 @@ -303,11 +303,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 ce949991..852be848 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 @@ -183,8 +183,8 @@ - - + +