From e03cbb4359a3104e35f6e1ecdea12e2798d6eb3c Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 9 Jun 2023 16:36:35 +0900 Subject: [PATCH] no message --- .../biz/cache/dao/CacheMenuMapper.java | 2 +- .../biz/cache/service/CacheService.java | 4 +- .../cache/service/bean/CacheServiceBean.java | 6 +- .../biz/cache/util/CacheServiceUtils.java | 6 +- .../biz/cache/web/CacheController.java | 6 +- .../biz/cmm/XitAuthorRoleRelateVO.java | 10 +-- .../framework/biz/cmm/XitMenuCreatDtlsVO.java | 2 +- .../biz/cmm/dao/XitFrameUnitMapper.java | 4 +- .../biz/cmm/service/XitFrameUnitService.java | 20 ++--- .../service/bean/XitFrameCrudServiceBean.java | 24 +++--- .../service/bean/XitFrameUnitServiceBean.java | 42 +++++------ .../biz/mng/auth/XitAuthGrpMngVO.java | 10 +-- .../biz/mng/auth/XitAuthHierarchyMngVO.java | 2 +- .../biz/mng/auth/XitAuthRegMngVO.java | 16 ++-- .../biz/mng/auth/XitAuthRuleMngVO.java | 2 +- .../biz/mng/auth/XitAuthUsrMngVO.java | 2 +- .../biz/mng/auth/XitAuthorGroupInfoVO.java | 2 +- .../biz/mng/auth/XitAuthorInfoVO.java | 2 +- .../biz/mng/auth/dao/AuthAuthorMgtMapper.java | 2 +- .../auth/service/AuthAuthorMgtService.java | 2 +- .../mng/auth/service/AuthGrpMgtService.java | 4 +- .../bean/AuthAuthorMgtServiceBean.java | 14 ++-- .../bean/AuthByUserMgtServiceBean.java | 6 +- .../service/bean/AuthGrpMgtServiceBean.java | 28 +++---- .../bean/AuthHierarchyMgtServiceBean.java | 74 +++++++++---------- .../mng/auth/web/AuthAuthorMgtController.java | 6 +- .../auth/web/AuthHierarchyMgtController.java | 18 ++--- .../biz/mng/menu/MenuCreateMngVO.java | 16 ++-- .../framework/biz/mng/menu/MenuListMngVO.java | 16 ++-- .../biz/mng/menu/dao/MenuByRoleMgtMapper.java | 2 +- .../bean/MenuByRoleMgtServiceBean.java | 6 +- .../biz/mng/user/XitUserScrtySetupVO.java | 2 +- .../biz/mng/user/service/UserMgtService.java | 2 +- .../user/service/bean/UserMgtServiceBean.java | 18 ++--- .../user/web/XitUserEtcOptMngController.java | 2 +- .../fims/framework/core/XitMenuManageVO.java | 2 +- .../core/interceptor/MenuIntercepter.java | 2 +- .../cache/cachecode-mysql-mapper.xml | 2 +- .../cache/cachemenu-mysql-mapper.xml | 10 +-- .../cmm/XitFrameCrud-mysql-mapper.xml | 72 +++++++++--------- .../cmm/XitFrameUnit-mysql-mapper.xml | 10 +-- .../framework/cmm/XitMain-mysql-mapper.xml | 8 +- .../mng/auth/auth-author-mysql-mapper.xml | 24 +++--- .../mng/auth/auth-by-user-mysql-mapper.xml | 2 +- .../mng/auth/auth-grp-mysql-mapper.xml | 12 +-- .../mng/auth/auth-hierarchy-mysql-mapper.xml | 2 +- .../mng/menu/menu-by-role-mysql-mapper.xml | 18 ++--- .../framework/mng/menu/menu-mysql-mapper.xml | 4 +- .../framework/mng/usr/user-mysql-mapper.xml | 20 ++--- .../biz/mng/admin/mngConectionLogMgtForm.jsp | 2 +- .../mng/auth/backup/XitAuthGrpMng_edit.jsp | 4 +- .../mng/auth/backup/XitAuthGrpMng_input.jsp | 4 +- .../mng/auth/backup/XitAuthGrpMng_list.jsp | 2 +- .../auth/backup/XitAuthHierarchyMng_edit.jsp | 28 +++---- .../auth/backup/XitAuthHierarchyMng_list.jsp | 6 +- .../mng/auth/backup/XitAuthRegMng_edit.jsp | 6 +- .../mng/auth/backup/XitAuthRegMng_input.jsp | 6 +- .../mng/auth/backup/XitAuthRegMng_list.jsp | 16 ++-- .../mng/auth/backup/XitAuthRegMng_list2.jsp | 14 ++-- .../backup/XitAuthRegMng_rolegrant_popup.jsp | 2 +- .../XitAuthRegMng_rolegrant_popup.jsp_bak | 2 +- .../mng/auth/backup/XitAuthUsrMng_list.jsp | 10 +-- .../mng/auth/backup/XitAuthUsrMng_list3.jsp | 6 +- .../biz/mng/auth/mngAuthAuthorMgtForm.jsp | 6 +- .../biz/mng/auth/mngAuthAuthorMgtPopup.jsp | 12 +-- .../biz/mng/auth/mngAuthByUserMgtForm.jsp | 4 +- .../biz/mng/auth/mngAuthGrpMgtForm.jsp | 2 +- .../biz/mng/auth/mngAuthGrpMgtPopup.jsp | 2 +- .../biz/mng/auth/mngAuthHierarchyMgtForm.jsp | 6 +- .../biz/mng/auth/mngAuthHierarchyMgtPopup.jsp | 44 +++++------ .../biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp | 6 +- .../menu/backup/XitMenuCreateMng_list2.jsp | 10 +-- .../biz/mng/menu/mngMenuByRoleMgtForm.jsp | 8 +- .../biz/mng/menu/mngMenuByRoleMgtPopup.jsp | 12 +-- .../biz/mng/usr/XitUserEtcOptMng_list.jsp | 4 +- .../biz/mng/usr/backup/XitUserRegMng_edit.jsp | 4 +- .../jsp/include/fims/btns-biz-popup-tab.jsp | 2 +- .../jsp/include/fims/btns-biz-popup-use.jsp | 2 +- .../jsp/include/fims/btns-biz-popup.jsp | 2 +- .../jsp/include/fims/title-biz-popup.jsp | 2 +- .../3rd-party/sheetJS/js/xlsx.full.min.js | 2 +- .../3rd-party/tableExport/js/xlsx.core.min.js | 2 +- .../3rd-party/tuiGrid/js/xlsx.full.min.js | 2 +- 83 files changed, 405 insertions(+), 405 deletions(-) diff --git a/src/main/java/cokr/xit/fims/framework/biz/cache/dao/CacheMenuMapper.java b/src/main/java/cokr/xit/fims/framework/biz/cache/dao/CacheMenuMapper.java index f991d20f..8edfd3e0 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/cache/dao/CacheMenuMapper.java +++ b/src/main/java/cokr/xit/fims/framework/biz/cache/dao/CacheMenuMapper.java @@ -11,5 +11,5 @@ public interface CacheMenuMapper { List> selectMenuListByUser(final String uniqId); - List> selectMenuListByAuthorId(final String authorId); + List> selectMenuListByAuthId(final String authId); } diff --git a/src/main/java/cokr/xit/fims/framework/biz/cache/service/CacheService.java b/src/main/java/cokr/xit/fims/framework/biz/cache/service/CacheService.java index 4143da85..a79507c9 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/cache/service/CacheService.java +++ b/src/main/java/cokr/xit/fims/framework/biz/cache/service/CacheService.java @@ -41,10 +41,10 @@ public interface CacheService { List> findMenuListByUser(final String uniqId); /** * 궘한별 메뉴 조회 - * @param authorId + * @param authId * @return List */ - List> findMenuListByAuthorId(final String authorId); + List> findMenuListByAuthId(final String authId); /** * 메뉴 캐시 Evict */ diff --git a/src/main/java/cokr/xit/fims/framework/biz/cache/service/bean/CacheServiceBean.java b/src/main/java/cokr/xit/fims/framework/biz/cache/service/bean/CacheServiceBean.java index 001bb26d..4abe740e 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/cache/service/bean/CacheServiceBean.java +++ b/src/main/java/cokr/xit/fims/framework/biz/cache/service/bean/CacheServiceBean.java @@ -79,11 +79,11 @@ public class CacheServiceBean extends AbstractServiceBean implements CacheServic return menuMapper.selectMenuListByUser(uniqId); } - @Cacheable(cacheNames="menuCache", key = "#authorId") + @Cacheable(cacheNames="menuCache", key = "#authId") @Override @Transactional(readOnly = true) - public List> findMenuListByAuthorId(final String authorId) { - return menuMapper.selectMenuListByAuthorId(authorId); + public List> findMenuListByAuthId(final String authId) { + return menuMapper.selectMenuListByAuthId(authId); } @Override diff --git a/src/main/java/cokr/xit/fims/framework/biz/cache/util/CacheServiceUtils.java b/src/main/java/cokr/xit/fims/framework/biz/cache/util/CacheServiceUtils.java index 2fd64b3e..f690bea4 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/cache/util/CacheServiceUtils.java +++ b/src/main/java/cokr/xit/fims/framework/biz/cache/util/CacheServiceUtils.java @@ -58,11 +58,11 @@ public class CacheServiceUtils { /** * - * @param authorId String + * @param authId String * @return List> */ - public static List> findMenuListByAuthorId(final String authorId) { - return JBeanRegistry.getCacheService().findMenuListByAuthorId(authorId); + public static List> findMenuListByAuthId(final String authId) { + return JBeanRegistry.getCacheService().findMenuListByAuthId(authId); } diff --git a/src/main/java/cokr/xit/fims/framework/biz/cache/web/CacheController.java b/src/main/java/cokr/xit/fims/framework/biz/cache/web/CacheController.java index 82e70124..9453ed4a 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/cache/web/CacheController.java +++ b/src/main/java/cokr/xit/fims/framework/biz/cache/web/CacheController.java @@ -70,10 +70,10 @@ public class CacheController extends AbstractController { return mav; } - @GetMapping(name = "", value="/getMenuListByAuthorId") - public ModelAndView getMenuListByAuthorId(final String authorId) { + @GetMapping(name = "", value="/getMenuListByAuthId") + public ModelAndView getMenuListByAuthId(final String authId) { ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW); - mav.addObject("allMenuList", CacheServiceUtils.findMenuListByAuthorId(authorId)); + mav.addObject("allMenuList", CacheServiceUtils.findMenuListByAuthId(authId)); return mav; } diff --git a/src/main/java/cokr/xit/fims/framework/biz/cmm/XitAuthorRoleRelateVO.java b/src/main/java/cokr/xit/fims/framework/biz/cmm/XitAuthorRoleRelateVO.java index 8135c592..b039669a 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/cmm/XitAuthorRoleRelateVO.java +++ b/src/main/java/cokr/xit/fims/framework/biz/cmm/XitAuthorRoleRelateVO.java @@ -19,16 +19,16 @@ public class XitAuthorRoleRelateVO extends BaseVO { */ private static final long serialVersionUID = 3707886158690476749L; - protected String authorId; //권한 코드 + protected String authId; //권한 코드 protected String roleCode; //역할 코드 protected String creatDt; //생성 일시 - public String getAuthorId() { - return authorId; + public String getAuthId() { + return authId; } - public void setAuthorId(String authorId) { - this.authorId = authorId; + public void setAuthId(String authId) { + this.authId = authId; } public String getRoleCode() { return roleCode; diff --git a/src/main/java/cokr/xit/fims/framework/biz/cmm/XitMenuCreatDtlsVO.java b/src/main/java/cokr/xit/fims/framework/biz/cmm/XitMenuCreatDtlsVO.java index 810aa007..c9f899e5 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/cmm/XitMenuCreatDtlsVO.java +++ b/src/main/java/cokr/xit/fims/framework/biz/cmm/XitMenuCreatDtlsVO.java @@ -27,7 +27,7 @@ public class XitMenuCreatDtlsVO { private static final long serialVersionUID = 568460849738293096L; private String menuNo; //메뉴 번호 - private String authorId; //권한 코드 + private String authId; //권한 코드 private String mapngCreatId; //매핑 생성 id diff --git a/src/main/java/cokr/xit/fims/framework/biz/cmm/dao/XitFrameUnitMapper.java b/src/main/java/cokr/xit/fims/framework/biz/cmm/dao/XitFrameUnitMapper.java index a4af06c9..5359fe04 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/cmm/dao/XitFrameUnitMapper.java +++ b/src/main/java/cokr/xit/fims/framework/biz/cmm/dao/XitFrameUnitMapper.java @@ -37,12 +37,12 @@ public interface XitFrameUnitMapper { * 
메소드 설명: 권한코드별 메뉴목록 조회
 	 * 	-권한에 부여된 메뉴 목록을 조회 한다.
 	 *
- * @param authorId 권한코드 + * @param authId 권한코드 * @return List 요청처리 후 응답객체 * @author: 박민규 * @date: 2020. 11. 20. */ - public List> findMenuListByAuthorId(String authorId) throws SQLException; + public List> findMenuListByAuthId(String authId) throws SQLException; /** diff --git a/src/main/java/cokr/xit/fims/framework/biz/cmm/service/XitFrameUnitService.java b/src/main/java/cokr/xit/fims/framework/biz/cmm/service/XitFrameUnitService.java index 0d8c5c9e..5b92bad6 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/cmm/service/XitFrameUnitService.java +++ b/src/main/java/cokr/xit/fims/framework/biz/cmm/service/XitFrameUnitService.java @@ -141,12 +141,12 @@ public interface XitFrameUnitService { * 
메소드 설명: 권한코드별 메뉴목록 조회
 	 * 	-권한에 부여된 메뉴 목록을 조회 한다.
 	 *
- * @param authorId 권한코드 + * @param authId 권한코드 * @return List> 요청처리 후 응답객체 * @author: 박민규 * @date: 2020. 11. 20. */ - public List> findMenuListByAuthorId(String authorId); + public List> findMenuListByAuthId(String authId); @@ -167,14 +167,14 @@ public interface XitFrameUnitService { * 
메소드 설명: 권한역할관계 추가/제거
 	 * 	-권한에 역할(Role)을 연결 또는 제거 한다.
 	 *
- * @param authorId 권한코드 + * @param authId 권한코드 * @param roleCode 역할코드 * @param isAdd 등록여부 * @return void 요청처리 후 응답객체 * @author: 박민규 * @date: 2020. 4. 17. */ - public void addAuthRoleRelation(String authorId, String roleCode, boolean isAdd); + public void addAuthRoleRelation(String authId, String roleCode, boolean isAdd); @@ -274,7 +274,7 @@ public interface XitFrameUnitService { * @author: 박민규 * @date: 2020. 10. 30. */ - public String getDefaultAuthorId(String grpId); + public String getDefaultAuthId(String grpId); @@ -292,12 +292,12 @@ public interface XitFrameUnitService { * case2. 자신의 권한과 권한계층상의 동일or하위 권한으로만 변경 or 타인에게 부여가 가능하다. * * @param uniqId 사용자 고유ID - * @param trgetAuthorId 대상 권한코드(변경하려는 권한 코드) + * @param trgetAuthId 대상 권한코드(변경하려는 권한 코드) * @return boolean 요청처리 후 응답객체 * @author: 박민규 * @date: 2020. 11. 1. */ - public boolean isCheckUserForCanChange(String uniqId, String trgetAuthorId); + public boolean isCheckUserForCanChange(String uniqId, String trgetAuthId); /** * 
메소드 설명: 사용자권한코드로 변경 가능 여부를 확인 후 true/false를 반환한다.
 	 * 	 -본 메서드의 목적은 비정상적인 루트로 관리자 권한을 취득 할 수 없도록 하는 것이다.
@@ -307,11 +307,11 @@ public interface XitFrameUnitService {
 	 * 		case1. 자신의 권한보다 상위 권한으로 변경 or 타인에게 부여 할 수 없다.
 	 * 		case2. 자신의 권한과 권한계층상의 동일or하위 권한으로만 변경 or 타인에게 부여가 가능하다.
 	 *
- * @param userAuthorId 사용자 권한코드 - * @param trgetAuthorId 대상 권한코드(변경하려는 권한 코드) + * @param userAuthId 사용자 권한코드 + * @param trgetAuthId 대상 권한코드(변경하려는 권한 코드) * @return boolean 요청처리 후 응답객체 * @author: 박민규 * @date: 2020. 11. 1. */ - public boolean isCheckUserAuthorIdForCanChange(String userAuthorId, String trgetAuthorId); + public boolean isCheckUserAuthIdForCanChange(String userAuthId, String trgetAuthId); } diff --git a/src/main/java/cokr/xit/fims/framework/biz/cmm/service/bean/XitFrameCrudServiceBean.java b/src/main/java/cokr/xit/fims/framework/biz/cmm/service/bean/XitFrameCrudServiceBean.java index 4bd2e4f8..e3a42cd6 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/cmm/service/bean/XitFrameCrudServiceBean.java +++ b/src/main/java/cokr/xit/fims/framework/biz/cmm/service/bean/XitFrameCrudServiceBean.java @@ -211,7 +211,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getAuthorId())) + if(XitCmmnUtil.isEmpty(vo.getAuthId())) emsg = String.format("(%s)권한코드(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -242,7 +242,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getAuthorId())) + if(XitCmmnUtil.isEmpty(vo.getAuthId())) emsg = String.format("(%s)권한코드(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -275,7 +275,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getAuthorId())) + if(XitCmmnUtil.isEmpty(vo.getAuthId())) emsg = String.format("(%s)권한코드(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -308,7 +308,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getAuthorId())) + if(XitCmmnUtil.isEmpty(vo.getAuthId())) emsg = String.format("(%s)권한코드(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -363,7 +363,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getAuthorId())) + if(XitCmmnUtil.isEmpty(vo.getAuthId())) emsg = String.format("(%s)권한코드(은)는 필수조건 입니다.", table); if(XitCmmnUtil.isEmpty(vo.getRoleCode())) emsg = String.format("(%s)역할코드(은)는 필수조건 입니다.", table); @@ -396,7 +396,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getAuthorId())) + if(XitCmmnUtil.isEmpty(vo.getAuthId())) emsg = String.format("(%s)권한코드(은)는 필수조건 입니다.", table); if(XitCmmnUtil.isEmpty(vo.getRoleCode())) emsg = String.format("(%s)역할코드(은)는 필수조건 입니다.", table); @@ -431,7 +431,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getAuthorId())) + if(XitCmmnUtil.isEmpty(vo.getAuthId())) emsg = String.format("(%s)권한코드(은)는 필수조건 입니다.", table); if(XitCmmnUtil.isEmpty(vo.getRoleCode())) emsg = String.format("(%s)역할코드(은)는 필수조건 입니다.", table); @@ -466,7 +466,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF * 필수조건 확인 */ String emsg = null; - if(XitCmmnUtil.isEmpty(vo.getAuthorId())) + if(XitCmmnUtil.isEmpty(vo.getAuthId())) emsg = String.format("(%s)권한코드(은)는 필수조건 입니다.", table); if(XitCmmnUtil.isEmpty(vo.getRoleCode())) emsg = String.format("(%s)역할코드(은)는 필수조건 입니다.", table); @@ -2418,7 +2418,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF String emsg = null; if(XitCmmnUtil.isEmpty(vo.getMenuNo())) emsg = String.format("(%s)메뉴번호(은)는 필수조건 입니다.", table); - if(XitCmmnUtil.isEmpty(vo.getAuthorId())) + if(XitCmmnUtil.isEmpty(vo.getAuthId())) emsg = String.format("(%s)권한코드(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -2451,7 +2451,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF String emsg = null; if(XitCmmnUtil.isEmpty(vo.getMenuNo())) emsg = String.format("(%s)메뉴번호(은)는 필수조건 입니다.", table); - if(XitCmmnUtil.isEmpty(vo.getAuthorId())) + if(XitCmmnUtil.isEmpty(vo.getAuthId())) emsg = String.format("(%s)권한코드(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -2486,7 +2486,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF String emsg = null; if(XitCmmnUtil.isEmpty(vo.getMenuNo())) emsg = String.format("(%s)메뉴번호(은)는 필수조건 입니다.", table); - if(XitCmmnUtil.isEmpty(vo.getAuthorId())) + if(XitCmmnUtil.isEmpty(vo.getAuthId())) emsg = String.format("(%s)권한코드(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); @@ -2521,7 +2521,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF String emsg = null; if(XitCmmnUtil.isEmpty(vo.getMenuNo())) emsg = String.format("(%s)메뉴번호(은)는 필수조건 입니다.", table); - if(XitCmmnUtil.isEmpty(vo.getAuthorId())) + if(XitCmmnUtil.isEmpty(vo.getAuthId())) emsg = String.format("(%s)권한코드(은)는 필수조건 입니다.", table); if(emsg!=null){ logger.error(emsg); diff --git a/src/main/java/cokr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java b/src/main/java/cokr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java index 18478e6f..256c9c10 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java +++ b/src/main/java/cokr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java @@ -227,8 +227,8 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF } @Override - public List> findMenuListByAuthorId(String authorId){ - return CacheServiceUtils.findMenuListByAuthorId(authorId); + public List> findMenuListByAuthId(String authId){ + return CacheServiceUtils.findMenuListByAuthId(authId); } @Override @@ -248,12 +248,12 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF } @Override - public void addAuthRoleRelation(String authorId, String roleCode, boolean isAdd) { + public void addAuthRoleRelation(String authId, String roleCode, boolean isAdd) { /** * 필수값 설정 */ XitAuthorRoleRelateVO vo = new XitAuthorRoleRelateVO(); - vo.setAuthorId(authorId); + vo.setAuthId(authId); vo.setRoleCode(roleCode); boolean isExists = XitCmmnUtil.notEmpty(xitFrameCrudService.findXitAuthorRoleRelate(vo)); @@ -424,7 +424,7 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF * @date: 2020. 10. 30. */ @Override - public String getDefaultAuthorId(String grpId) { + public String getDefaultAuthId(String grpId) { if (XitCmmnUtil.isEmpty(grpId)) return "ROLE_USER"; @@ -436,16 +436,16 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF if (XitCmmnUtil.isEmpty(groupInfo)) return "ROLE_USER"; else { - if (XitCmmnUtil.isEmpty(groupInfo.getAuthorId())) + if (XitCmmnUtil.isEmpty(groupInfo.getAuthId())) return "ROLE_USER"; else - return groupInfo.getAuthorId(); + return groupInfo.getAuthId(); } } @Override - public boolean isCheckUserForCanChange(String uniqId, String trgetAuthorId) { + public boolean isCheckUserForCanChange(String uniqId, String trgetAuthId) { /** * 사용자 권한 정보 확인 */ @@ -453,13 +453,13 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF XitUserScrtySetupVO userScrtySetupVO = new XitUserScrtySetupVO(); userScrtySetupVO.setScrtySetupTrgetId(uniqId); List listUserScrtySetupVO = xitFrameCrudService.findXitUserScrtySetups(userScrtySetupVO); - String userAuthorId = XitCmmnUtil.isEmpty(listUserScrtySetupVO)?null:listUserScrtySetupVO.get(0).getAuthorId(); + String userAuthId = XitCmmnUtil.isEmpty(listUserScrtySetupVO)?null:listUserScrtySetupVO.get(0).getAuthId(); - return this.isCheckUserAuthorIdForCanChange(userAuthorId, trgetAuthorId); + return this.isCheckUserAuthIdForCanChange(userAuthId, trgetAuthId); } @Override - public boolean isCheckUserAuthorIdForCanChange(String userAuthorId, String trgetAuthorId) { + public boolean isCheckUserAuthIdForCanChange(String userAuthId, String trgetAuthId) { /** * 유효성 확인 */ @@ -471,7 +471,7 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF return true; }else { //사용자의 권한 정보가 없을 때(비정상적인 루트로 등록한 사용자 계정으로 판단) - if(XitCmmnUtil.isEmpty(userAuthorId)) { + if(XitCmmnUtil.isEmpty(userAuthId)) { log.debug("This user is have not UserScrtySetup Data !!"); return false; } @@ -479,7 +479,7 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF boolean isExists = false; //사용자 권한과 매칭되는 역할(권한)계층정보 유무 확인 for(XitRoleSclsrtRescueVO item : listRoleSclsrtRescueVO) { - if(item.getParntsRole().equals(userAuthorId)) { + if(item.getParntsRole().equals(userAuthId)) { isExists = true; break; } @@ -487,7 +487,7 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF //사용자 권한이 최상위 권한이면 true 반환 if(!isExists) for(XitRoleSclsrtRescueVO item : listRoleSclsrtRescueVO) { - if(item.getChldrnRole().equals(userAuthorId)) { + if(item.getChldrnRole().equals(userAuthId)) { log.debug("This user is Top-Level Author !!"); return true; } @@ -503,7 +503,7 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF * 상위권한 여부 확인 * */ - return this.isHighAuthor(listRoleSclsrtRescueVO, userAuthorId, trgetAuthorId)?false:true; + return this.isHighAuthor(listRoleSclsrtRescueVO, userAuthId, trgetAuthId)?false:true; } @@ -515,13 +515,13 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF * * * @param list 역할계층구조 목록 데이터 - * @param authorId 권한코드 - * @param highAuthorId 상위권한코드 + * @param authId 권한코드 + * @param highAuthId 상위권한코드 * @return boolean 요청처리 후 응답객체 * @author: 박민규 * @date: 2020. 11. 1. */ - private boolean isHighAuthor(List list, String authorId, String highAuthorId) { + private boolean isHighAuthor(List list, String authId, String highAuthId) { boolean result = false; for (XitRoleSclsrtRescueVO item : list) { @@ -529,13 +529,13 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF if (result) break; // 권한코드가 일치하지 않으면 skip - if (!item.getParntsRole().equals(authorId)) + if (!item.getParntsRole().equals(authId)) continue; - if (item.getChldrnRole().equals(highAuthorId)) { // 상위 권한과 일치하면 + if (item.getChldrnRole().equals(highAuthId)) { // 상위 권한과 일치하면 result = true; } else { // 상위 권한과 일치하지 않으면 재호출 - result = this.isHighAuthor(list, item.getChldrnRole(), highAuthorId); + result = this.isHighAuthor(list, item.getChldrnRole(), highAuthId); } } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthGrpMngVO.java b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthGrpMngVO.java index 90a3b335..cebf0493 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthGrpMngVO.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthGrpMngVO.java @@ -41,7 +41,7 @@ public class XitAuthGrpMngVO extends BaseVO { /** * 권한 코드 */ - private String authorId; + private String authId; /** * 권한명 */ @@ -117,11 +117,11 @@ public class XitAuthGrpMngVO extends BaseVO { public void setDscrp(String dscrp) { this.dscrp = dscrp; } - public String getAuthorId() { - return authorId; + public String getAuthId() { + return authId; } - public void setAuthorId(String authorId) { - this.authorId = authorId; + public void setAuthId(String authId) { + this.authId = authId; } public String getAuthorNm() { return authorNm; diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthHierarchyMngVO.java b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthHierarchyMngVO.java index 11a63ee2..615c8ddd 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthHierarchyMngVO.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthHierarchyMngVO.java @@ -27,7 +27,7 @@ public class XitAuthHierarchyMngVO { /** * 권한코드 */ - private String authorId; + private String authId; /** * 권한등록일자 */ diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthRegMngVO.java b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthRegMngVO.java index 06adebc5..65ebe851 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthRegMngVO.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthRegMngVO.java @@ -26,7 +26,7 @@ public class XitAuthRegMngVO extends BaseVO { /** * 권한코드 */ - private String authorId; + private String authId; /** * 권한등록일자 */ @@ -55,18 +55,18 @@ public class XitAuthRegMngVO extends BaseVO { this.authorManage = authorManage; } /** - * authorId attribute 를 리턴한다. + * authId attribute 를 리턴한다. * @return String */ - public String getAuthorId() { - return authorId; + public String getAuthId() { + return authId; } /** - * authorId attribute 값을 설정한다. - * @param authorId String + * authId attribute 값을 설정한다. + * @param authId String */ - public void setAuthorId(String authorId) { - this.authorId = authorId; + public void setAuthId(String authId) { + this.authId = authId; } /** * authorCreatDe attribute 를 리턴한다. diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthRuleMngVO.java b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthRuleMngVO.java index 0426f5aa..c0cf04bb 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthRuleMngVO.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthRuleMngVO.java @@ -59,5 +59,5 @@ public class XitAuthRuleMngVO extends BaseVO { /** * 권한 코드 */ - private String authorId; + private String authId; } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthUsrMngVO.java b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthUsrMngVO.java index 82bce7f7..a4885215 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthUsrMngVO.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthUsrMngVO.java @@ -48,7 +48,7 @@ public class XitAuthUsrMngVO { /** * 권한코드 */ - private String authorId; + private String authId; /** * 등록 여부 */ diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthorGroupInfoVO.java b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthorGroupInfoVO.java index 80eb6004..aad1a048 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthorGroupInfoVO.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthorGroupInfoVO.java @@ -24,7 +24,7 @@ public class XitAuthorGroupInfoVO { private String grpId; //그룹 id private String groupNm; //그룹 명 private String dscrp; //그룹 설명 - private String authorId; //권한 코드 + private String authId; //권한 코드 private String authorNm; private String groupCreatDe; //그룹 생성 일 } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthorInfoVO.java b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthorInfoVO.java index 88613fe4..419640a7 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthorInfoVO.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/XitAuthorInfoVO.java @@ -25,7 +25,7 @@ public class XitAuthorInfoVO { */ private static final long serialVersionUID = 4982342550430087973L; - protected String authorId; //권한 코드 + protected String authId; //권한 코드 protected String authorNm; //권한 명 protected String dscrp; //권한 설명 protected String authorCreatDe; //권한 생성 일 diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/dao/AuthAuthorMgtMapper.java b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/dao/AuthAuthorMgtMapper.java index 622e4620..dde352d0 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/dao/AuthAuthorMgtMapper.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/dao/AuthAuthorMgtMapper.java @@ -52,7 +52,7 @@ public interface AuthAuthorMgtMapper { XitAuthorInfoVO selectAuthorInfo(final T t); int insertAuthorInfo(final XitAuthorInfoVO vo); int updateAuthorInfo(final XitAuthorInfoVO vo); - int deleteAuthorInfo(final String authorId); + int deleteAuthorInfo(final String authId); List selectRoleSclsrtRescues(final XitRoleSclsrtRescueVO vo); diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/AuthAuthorMgtService.java b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/AuthAuthorMgtService.java index 47465bac..b78586b5 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/AuthAuthorMgtService.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/AuthAuthorMgtService.java @@ -33,7 +33,7 @@ public interface AuthAuthorMgtService { XitAuthorInfoVO findAuthAuthor(final T t); void addAuthAuthor(final XitAuthorInfoVO vo); void modifyAuthAuthor(final XitAuthorInfoVO vo); - void removeAuthAuthor(final String authorId); + void removeAuthAuthor(final String authId); List findAuthRoleGrantList(final Map paraMap); diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/AuthGrpMgtService.java b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/AuthGrpMgtService.java index 782bfb59..70d065b0 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/AuthGrpMgtService.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/AuthGrpMgtService.java @@ -22,7 +22,7 @@ public interface AuthGrpMgtService { XitAuthorGroupInfoVO findAuthGrp(final T t); void addAuthGrp(final XitAuthorGroupInfoVO vo); void modifyAuthGrp(final XitAuthorGroupInfoVO vo); - void removeAuthGrp(final String authorId); + void removeAuthGrp(final String authId); - void isCheckUserForCanChange(final String uniqId, final String trgetAuthorId); + void isCheckUserForCanChange(final String uniqId, final String trgetAuthId); } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/bean/AuthAuthorMgtServiceBean.java b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/bean/AuthAuthorMgtServiceBean.java index 1578f54b..62d47799 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/bean/AuthAuthorMgtServiceBean.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/bean/AuthAuthorMgtServiceBean.java @@ -71,10 +71,10 @@ public class AuthAuthorMgtServiceBean extends AbstractServiceBean implements Aut XitRoleSclsrtRescueVO roleSclsrtRescueVO = new XitRoleSclsrtRescueVO(); //부모관계 생성 roleSclsrtRescueVO.setParntsRole(PARNTS_AUTHOR); - roleSclsrtRescueVO.setChldrnRole(vo.getAuthorId()); + roleSclsrtRescueVO.setChldrnRole(vo.getAuthId()); mapper.insertRoleSclsrtRescue(roleSclsrtRescueVO); //자녀관계 생성 - roleSclsrtRescueVO.setParntsRole(vo.getAuthorId()); + roleSclsrtRescueVO.setParntsRole(vo.getAuthId()); roleSclsrtRescueVO.setChldrnRole(CHLDRN_AUTHOR); mapper.insertRoleSclsrtRescue(roleSclsrtRescueVO); } @@ -86,18 +86,18 @@ public class AuthAuthorMgtServiceBean extends AbstractServiceBean implements Aut } @Transactional - public void removeAuthAuthor(final String authorId){ + public void removeAuthAuthor(final String authId){ //계층구조 삭제 XitRoleSclsrtRescueVO roleSclsrtRescueVO = new XitRoleSclsrtRescueVO(); roleSclsrtRescueVO.setParntsRole(PARNTS_AUTHOR); - roleSclsrtRescueVO.setChldrnRole(authorId); + roleSclsrtRescueVO.setChldrnRole(authId); mapper.deleteRoleSclsrtRescue(roleSclsrtRescueVO); //자녀관계 제거 - roleSclsrtRescueVO.setParntsRole(authorId); + roleSclsrtRescueVO.setParntsRole(authId); roleSclsrtRescueVO.setChldrnRole(CHLDRN_AUTHOR); mapper.deleteRoleSclsrtRescue(roleSclsrtRescueVO); - mapper.deleteAuthorInfo(authorId); + mapper.deleteAuthorInfo(authId); } @Override @@ -113,7 +113,7 @@ public class AuthAuthorMgtServiceBean extends AbstractServiceBean implements Aut List> mapList = (List>)paraMap.get("grantData"); mapList.forEach(map -> { - map.put("authorId", paraMap.get("authorId")); + map.put("authId", paraMap.get("authId")); if(Objects.equals(map.get("regYn"), "N")) mapper.deleteRoleGrant(map); else diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/bean/AuthByUserMgtServiceBean.java b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/bean/AuthByUserMgtServiceBean.java index 90a0b633..3dd8504c 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/bean/AuthByUserMgtServiceBean.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/bean/AuthByUserMgtServiceBean.java @@ -41,11 +41,11 @@ public class AuthByUserMgtServiceBean extends AbstractServiceBean implements Aut String sessionUniqId = XitCmmnUtil.getUserInfo().getUniqId(); paraList.forEach(map -> { //유효성확인 - authGrpMgtService.isCheckUserForCanChange(sessionUniqId, String.valueOf(map.get("authorId"))); + authGrpMgtService.isCheckUserForCanChange(sessionUniqId, String.valueOf(map.get("authId"))); XitUserScrtySetupVO vo = new XitUserScrtySetupVO(); vo.setScrtySetupTrgetId(String.valueOf(map.get("uniqId"))); - vo.setAuthorId(String.valueOf(map.get("authorId"))); + vo.setAuthId(String.valueOf(map.get("authId"))); if(Objects.equals("N", map.get("regYn"))){ userMapper.insertUserScrtySetup(vo); @@ -63,7 +63,7 @@ public class AuthByUserMgtServiceBean extends AbstractServiceBean implements Aut paraList.forEach(map -> { XitUserScrtySetupVO vo = new XitUserScrtySetupVO(); vo.setScrtySetupTrgetId(String.valueOf(map.get("uniqId"))); - vo.setAuthorId(userMgtService.getDefaultAuthorId(String.valueOf(map.get("grpId")))); + vo.setAuthId(userMgtService.getDefaultAuthId(String.valueOf(map.get("grpId")))); userMapper.updateUserScrtySetup(vo); }); } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/bean/AuthGrpMgtServiceBean.java b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/bean/AuthGrpMgtServiceBean.java index 14b94e40..b58b0437 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/bean/AuthGrpMgtServiceBean.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/bean/AuthGrpMgtServiceBean.java @@ -53,7 +53,7 @@ public class AuthGrpMgtServiceBean extends AbstractServiceBean implements AuthGr @Transactional public void addAuthGrp(final XitAuthorGroupInfoVO vo) { // 유효성 확인 - this.isCheckUserForCanChange(XitCmmnUtil.getUserInfo().getUniqId(), vo.getAuthorId()); + this.isCheckUserForCanChange(XitCmmnUtil.getUserInfo().getUniqId(), vo.getAuthId()); try { vo.setGrpId(groupIdGnrService.getNextStringId()); @@ -67,7 +67,7 @@ public class AuthGrpMgtServiceBean extends AbstractServiceBean implements AuthGr @Transactional public void modifyAuthGrp(final XitAuthorGroupInfoVO vo) { // 유효성 확인 - this.isCheckUserForCanChange(XitCmmnUtil.getUserInfo().getUniqId(), vo.getAuthorId()); + this.isCheckUserForCanChange(XitCmmnUtil.getUserInfo().getUniqId(), vo.getAuthId()); mapper.updateAuthorGroupInfo(vo); } @@ -79,19 +79,19 @@ public class AuthGrpMgtServiceBean extends AbstractServiceBean implements AuthGr } @Transactional(readOnly = true) - public void isCheckUserForCanChange(final String uniqId, final String trgetAuthorId) { + public void isCheckUserForCanChange(final String uniqId, final String trgetAuthId) { //사용자보안설정 조회 XitUserScrtySetupVO userScrtySetupVO = new XitUserScrtySetupVO(); userScrtySetupVO.setScrtySetupTrgetId(uniqId); List listUserScrtySetupVO = userMgtMapper.selectUserScrtySetups(userScrtySetupVO); - String userAuthorId = XitCmmnUtil.isEmpty(listUserScrtySetupVO)?null:listUserScrtySetupVO.get(0).getAuthorId(); + String userAuthId = XitCmmnUtil.isEmpty(listUserScrtySetupVO)?null:listUserScrtySetupVO.get(0).getAuthId(); - if(!this.isCheckUserAuthorIdForCanChange(userAuthorId, trgetAuthorId)) + if(!this.isCheckUserAuthIdForCanChange(userAuthId, trgetAuthId)) throw BizRuntimeException.create(MessageKey.CUSTOM_MSG, "자신의 권한보다 상위 권한을 설정 할 수 없습니다.");; } - private boolean isCheckUserAuthorIdForCanChange(final String userAuthorId, final String trgetAuthorId) { + private boolean isCheckUserAuthIdForCanChange(final String userAuthId, final String trgetAuthId) { //역할(권한)계층구조 데이터 목록 조회 List listRoleSclsrtRescueVO = authAuthorMgtMapper.selectRoleSclsrtRescues(null); //역할(권한)계층구조를 사용하지 않고 있는 경우 true 반환 @@ -100,7 +100,7 @@ public class AuthGrpMgtServiceBean extends AbstractServiceBean implements AuthGr return true; }else { //사용자의 권한 정보가 없을 때(비정상적인 루트로 등록한 사용자 계정으로 판단) - if(XitCmmnUtil.isEmpty(userAuthorId)) { + if(XitCmmnUtil.isEmpty(userAuthId)) { log.debug("This user is have not UserScrtySetup Data !!"); return false; } @@ -108,7 +108,7 @@ public class AuthGrpMgtServiceBean extends AbstractServiceBean implements AuthGr boolean isExists = false; //사용자 권한과 매칭되는 역할(권한)계층정보 유무 확인 for(XitRoleSclsrtRescueVO item : listRoleSclsrtRescueVO) { - if(item.getParntsRole().equals(userAuthorId)) { + if(item.getParntsRole().equals(userAuthId)) { isExists = true; break; } @@ -116,7 +116,7 @@ public class AuthGrpMgtServiceBean extends AbstractServiceBean implements AuthGr //사용자 권한이 최상위 권한이면 true 반환 if(!isExists) for(XitRoleSclsrtRescueVO item : listRoleSclsrtRescueVO) { - if(item.getChldrnRole().equals(userAuthorId)) { + if(item.getChldrnRole().equals(userAuthId)) { log.debug("This user is Top-Level Author !!"); return true; } @@ -132,10 +132,10 @@ public class AuthGrpMgtServiceBean extends AbstractServiceBean implements AuthGr * 상위권한 여부 확인 * */ - return !this.isHighAuthor(listRoleSclsrtRescueVO, userAuthorId, trgetAuthorId); + return !this.isHighAuthor(listRoleSclsrtRescueVO, userAuthId, trgetAuthId); } - private boolean isHighAuthor(final List list, final String authorId, final String highAuthorId) { + private boolean isHighAuthor(final List list, final String authId, final String highAuthId) { boolean result = false; for (XitRoleSclsrtRescueVO item : list) { @@ -143,13 +143,13 @@ public class AuthGrpMgtServiceBean extends AbstractServiceBean implements AuthGr if (result) break; // 권한코드가 일치하지 않으면 skip - if (!item.getParntsRole().equals(authorId)) + if (!item.getParntsRole().equals(authId)) continue; - if (item.getChldrnRole().equals(highAuthorId)) { // 상위 권한과 일치하면 + if (item.getChldrnRole().equals(highAuthId)) { // 상위 권한과 일치하면 result = true; } else { // 상위 권한과 일치하지 않으면 재호출 - result = this.isHighAuthor(list, item.getChldrnRole(), highAuthorId); + result = this.isHighAuthor(list, item.getChldrnRole(), highAuthId); } } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/bean/AuthHierarchyMgtServiceBean.java b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/bean/AuthHierarchyMgtServiceBean.java index ff6f80cf..afb83a69 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/bean/AuthHierarchyMgtServiceBean.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/service/bean/AuthHierarchyMgtServiceBean.java @@ -33,7 +33,7 @@ public class AuthHierarchyMgtServiceBean extends AbstractServiceBean implements if(XitCmmnUtil.notEmpty(voList)) { for(XitAuthHierarchyMngVO vo : voList) { - String strAuthorRescueCode = this.getStrAuthHierarchy(vo.getAuthorId()); + String strAuthorRescueCode = this.getStrAuthHierarchy(vo.getAuthId()); vo.setAuthorRescueCode(strAuthorRescueCode); vo.setAuthorRescueCodeNm(this.convertKorNm(strAuthorRescueCode)); } @@ -51,9 +51,9 @@ public class AuthHierarchyMgtServiceBean extends AbstractServiceBean implements return result; - String topButtonAuthorId = this.getStrAuthHierarchy(listRoleSclsrtRescueVO.get(0).getChldrnRole()); - topButtonAuthorId = topButtonAuthorId.split(">")[0].trim(); - String strAuthorRescueCode = this.getStrAuthHierarchy(topButtonAuthorId); + String topButtonAuthId = this.getStrAuthHierarchy(listRoleSclsrtRescueVO.get(0).getChldrnRole()); + topButtonAuthId = topButtonAuthId.split(">")[0].trim(); + String strAuthorRescueCode = this.getStrAuthHierarchy(topButtonAuthId); result.setAuthorRescueCode(strAuthorRescueCode); return result; @@ -61,25 +61,25 @@ public class AuthHierarchyMgtServiceBean extends AbstractServiceBean implements @Transactional public void saveAuthHierarchy(final XitAuthHierarchyMngVO vo) { - if(XitCmmnUtil.isEmpty(vo.getAuthorId())) + if(XitCmmnUtil.isEmpty(vo.getAuthId())) throw BizRuntimeException.create(MessageKey.CUSTOM_MSG, "권한코드는 필수조건 입니다."); - String[] arrAuthorIdGrp = vo.getAuthorId().split(","); //권한코드 묶음 목록 + String[] arrAuthIdGrp = vo.getAuthId().split(","); //권한코드 묶음 목록 /** * 유효성 확인 * -최상위 부모는 반드시 한개 이어야 한다. * -최하위 자녀(최고관리자)는 반드시 한개 이어야 한다. */ - if(arrAuthorIdGrp[0].split(";").length>1) + if(arrAuthIdGrp[0].split(";").length>1) throw BizRuntimeException.create(MessageKey.CUSTOM_MSG,"최상위 부모는 한개만 설정 가능 합니다."); // 최하위 자녀 갯수 확인 - if(arrAuthorIdGrp[arrAuthorIdGrp.length-1].split(";").length>1) + if(arrAuthIdGrp[arrAuthIdGrp.length-1].split(";").length>1) throw BizRuntimeException.create(MessageKey.CUSTOM_MSG,"최하위 자녀는 한개만 설정 가능 합니다."); // 다중상속 구간 갯수 확인 int cnt = 0; - for(String authorIdGrp : arrAuthorIdGrp) { - if(authorIdGrp.split(";").length > 1) + for(String authIdGrp : arrAuthIdGrp) { + if(authIdGrp.split(";").length > 1) cnt++; } if(cnt > 1) @@ -88,14 +88,14 @@ public class AuthHierarchyMgtServiceBean extends AbstractServiceBean implements //권한계층구조 일괄 제거 authAuthorMgtMapper.deleteRoleSclsrtRescue(new XitRoleSclsrtRescueVO()); //권한계층 데이터 등록 - for(int i=0; i메소드 설명: 권한의 권한계층 구조를 문자열로 반환 한다. - * @param authorId + * @param authId * @return String 요청처리 후 응답객체 * @author: 박민규 * @date: 2020. 11. 2. */ - private String getStrAuthHierarchy(final String authorId) { + private String getStrAuthHierarchy(final String authId) { LinkedHashMap mParnts = new LinkedHashMap(); LinkedHashMap mChldrn = new LinkedHashMap(); List list = authAuthorMgtMapper.selectRoleSclsrtRescues(new XitRoleSclsrtRescueVO()); - this.getAuthHierarchy(list, authorId, false, mParnts); - this.getAuthHierarchy(list, authorId, true, mChldrn); + this.getAuthHierarchy(list, authId, false, mParnts); + this.getAuthHierarchy(list, authId, true, mChldrn); StringBuffer sb = new StringBuffer(); Iterator it = mParnts.keySet().iterator(); while(it.hasNext()) { sb.append(mParnts.get(it.next())).append(" > "); } - sb.append(authorId).append(" > "); + sb.append(authId).append(" > "); it = mChldrn.keySet().iterator(); while(it.hasNext()) { sb.append(mChldrn.get(it.next())).append(" > "); @@ -144,29 +144,29 @@ public class AuthHierarchyMgtServiceBean extends AbstractServiceBean implements /** * 
메소드 설명: 권한코드의 권한구조상의 상/하위 권한을 resultMap(LinkedHashMap)에 담아 반환 한다.
* @param list 역할계층구조 목록 데이터 - * @param authorId 권한코드 + * @param authId 권한코드 * @param isChldrnSearch 상위권한 탐색 여부(true: 상위권한 탐색, false: 하위권한 탐색) * @param resultMap 응답객체 * @return void 요청처리 후 응답객체 * @author: 박민규 * @date: 2020. 11. 2. */ - private void getAuthHierarchy(final List list, final String authorId, final boolean isChldrnSearch, final LinkedHashMap resultMap) { + private void getAuthHierarchy(final List list, final String authId, final boolean isChldrnSearch, final LinkedHashMap resultMap) { for (XitRoleSclsrtRescueVO item : list) { if(isChldrnSearch) { // 권한코드가 일치하지 않으면 skip - if (!item.getParntsRole().equals(authorId)) + if (!item.getParntsRole().equals(authId)) continue; //권한코드 Set - if(resultMap.containsKey(authorId)) { + if(resultMap.containsKey(authId)) { //동일한 값이면 담지 않음 - if(resultMap.get(authorId).equals(item.getChldrnRole())) + if(resultMap.get(authId).equals(item.getChldrnRole())) continue; - resultMap.put(authorId, resultMap.get(authorId)+", "+item.getChldrnRole()); + resultMap.put(authId, resultMap.get(authId)+", "+item.getChldrnRole()); }else { //동일한 값이 있으면 담지 않음 Iterator it = resultMap.values().iterator(); @@ -183,7 +183,7 @@ public class AuthHierarchyMgtServiceBean extends AbstractServiceBean implements } } if(!isExists) - resultMap.put(authorId, item.getChldrnRole()); + resultMap.put(authId, item.getChldrnRole()); } @@ -192,23 +192,23 @@ public class AuthHierarchyMgtServiceBean extends AbstractServiceBean implements }else { // 권한코드가 일치하지 않으면 skip - if (!item.getChldrnRole().equals(authorId)) + if (!item.getChldrnRole().equals(authId)) continue; //재탐색 this.getAuthHierarchy(list, item.getParntsRole(), isChldrnSearch, resultMap); //권한코드 Set - if(resultMap.containsKey(authorId)) { + if(resultMap.containsKey(authId)) { //동일한 값이면 담지 않음 - if(resultMap.get(authorId).equals(item.getParntsRole())) + if(resultMap.get(authId).equals(item.getParntsRole())) continue; - resultMap.put(authorId, resultMap.get(authorId)+", "+item.getParntsRole()); + resultMap.put(authId, resultMap.get(authId)+", "+item.getParntsRole()); }else { //동일한 값이 있으면 담지 않음 if(!resultMap.containsValue(item.getParntsRole())) { - resultMap.put(authorId, item.getParntsRole()); + resultMap.put(authId, item.getParntsRole()); } } } @@ -223,7 +223,7 @@ public class AuthHierarchyMgtServiceBean extends AbstractServiceBean implements List listAuthorInfoVO = authAuthorMgtMapper.selectAuthorInfos(null); Map mAuthorInfo = new HashMap(); for(XitAuthorInfoVO item : listAuthorInfoVO) { - mAuthorInfo.put(item.getAuthorId(), item.getAuthorNm()); + mAuthorInfo.put(item.getAuthId(), item.getAuthorNm()); } StringBuffer sb = new StringBuffer(); @@ -234,15 +234,15 @@ public class AuthHierarchyMgtServiceBean extends AbstractServiceBean implements if(i>0) sb.append(" > "); - String[] arrAuthorId = item.split(","); - for(int j=0; j authorInfoVOList = authAuthorMgtService.findAuthAuthors(null); Map mAuthorInfo = new HashMap(); - authorInfoVOList.forEach(infoVO -> mAuthorInfo.put(infoVO.getAuthorId(), infoVO.getAuthorNm())); + authorInfoVOList.forEach(infoVO -> mAuthorInfo.put(infoVO.getAuthId(), infoVO.getAuthorNm())); //권한코드 목록에서 비중복 권한만 추출 Map mNoDuplAuthorInfo = new HashMap(); mNoDuplAuthorInfo.putAll(mAuthorInfo); String[] arrAuthorRescue = authHierarchyMngVO.getAuthorRescueCode().split(">"); for(int i=0; i listAuthorInfo = new ArrayList<>(); - for (String authorId : mNoDuplAuthorInfo.keySet()) { + for (String authId : mNoDuplAuthorInfo.keySet()) { XitAuthorInfoVO authorInfo = new XitAuthorInfoVO(); - authorInfo.setAuthorId(authorId); - authorInfo.setAuthorNm(mNoDuplAuthorInfo.get(authorId)); + authorInfo.setAuthId(authId); + authorInfo.setAuthorNm(mNoDuplAuthorInfo.get(authId)); listAuthorInfo.add(authorInfo); } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/menu/MenuCreateMngVO.java b/src/main/java/cokr/xit/fims/framework/biz/mng/menu/MenuCreateMngVO.java index 00284724..0f674bf3 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/menu/MenuCreateMngVO.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/menu/MenuCreateMngVO.java @@ -24,7 +24,7 @@ public class MenuCreateMngVO extends BaseVO { /** 맵생성ID */ private String mapCreatId; /** 권한코드 */ - private String authorId; + private String authId; /** 권한정보설정 */ /** 권한명 */ @@ -78,18 +78,18 @@ public class MenuCreateMngVO extends BaseVO { this.mapCreatId = mapCreatId; } /** - * authorId attribute를 리턴한다. + * authId attribute를 리턴한다. * @return String */ - public String getAuthorId() { - return authorId; + public String getAuthId() { + return authId; } /** - * authorId attribute 값을 설정한다. - * @param authorId String + * authId attribute 값을 설정한다. + * @param authId String */ - public void setAuthorId(String authorId) { - this.authorId = authorId; + public void setAuthId(String authId) { + this.authId = authId; } /** * authorNm attribute를 리턴한다. diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/menu/MenuListMngVO.java b/src/main/java/cokr/xit/fims/framework/biz/mng/menu/MenuListMngVO.java index edc267a9..4898fd14 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/menu/MenuListMngVO.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/menu/MenuListMngVO.java @@ -41,7 +41,7 @@ public class MenuListMngVO { /** 권한정보설정 */ /** 권한코드 */ - private String authorId; + private String authId; /** 기타VO변수 */ private String tempValue; @@ -192,18 +192,18 @@ public class MenuListMngVO { this.creatPersonId = creatPersonId; } /** - * authorId attribute를 리턴한다. + * authId attribute를 리턴한다. * @return String */ - public String getAuthorId() { - return authorId; + public String getAuthId() { + return authId; } /** - * authorId attribute 값을 설정한다. - * @param authorId String + * authId attribute 값을 설정한다. + * @param authId String */ - public void setAuthorId(String authorId) { - this.authorId = authorId; + public void setAuthId(String authId) { + this.authId = authId; } /** diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/menu/dao/MenuByRoleMgtMapper.java b/src/main/java/cokr/xit/fims/framework/biz/mng/menu/dao/MenuByRoleMgtMapper.java index d8147c07..ec1f8067 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/menu/dao/MenuByRoleMgtMapper.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/menu/dao/MenuByRoleMgtMapper.java @@ -12,6 +12,6 @@ public interface MenuByRoleMgtMapper { List selectRoleInfos(T t); List selectMenuInfoByRoleList(T t); - int deleteMenuCreatDtls(final String authorId); + int deleteMenuCreatDtls(final String authId); int insertMenuCreatDtls(final XitMenuCreatDtlsVO vo); } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/menu/service/bean/MenuByRoleMgtServiceBean.java b/src/main/java/cokr/xit/fims/framework/biz/mng/menu/service/bean/MenuByRoleMgtServiceBean.java index 717651a0..2f92c393 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/menu/service/bean/MenuByRoleMgtServiceBean.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/menu/service/bean/MenuByRoleMgtServiceBean.java @@ -36,19 +36,19 @@ public class MenuByRoleMgtServiceBean extends AbstractServiceBean implements Men @Override @Transactional public void saveMenuByRoleList(Map paraMap) { - String authorId = String.valueOf(paraMap.get("authorId")); + String authId = String.valueOf(paraMap.get("authId")); @SuppressWarnings("unchecked") List menuNoList = (List)paraMap.get("menuNoList"); // 해당 권한의 메뉴 삭제 - mapper.deleteMenuCreatDtls(authorId); + mapper.deleteMenuCreatDtls(authId); // 메뉴 등록 menuNoList.forEach((menuNo) -> { mapper.insertMenuCreatDtls( XitMenuCreatDtlsVO .builder() - .authorId(authorId) + .authId(authId) .menuNo(menuNo) .build() ); diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/user/XitUserScrtySetupVO.java b/src/main/java/cokr/xit/fims/framework/biz/mng/user/XitUserScrtySetupVO.java index 5b6c83dc..fa899afe 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/user/XitUserScrtySetupVO.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/user/XitUserScrtySetupVO.java @@ -25,5 +25,5 @@ public class XitUserScrtySetupVO { private static final long serialVersionUID = -4431553754531650113L; protected String scrtySetupTrgetId; //보안 설정 대상 id - protected String authorId; //권한 코드 + protected String authId; //권한 코드 } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/user/service/UserMgtService.java b/src/main/java/cokr/xit/fims/framework/biz/mng/user/service/UserMgtService.java index e475da91..1270764c 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/user/service/UserMgtService.java +++ b/src/main/java/cokr/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 uniqId); - String getDefaultAuthorId(final String grpId); + String getDefaultAuthId(final String grpId); int addUserScrtySetup(final XitUserScrtySetupVO vo); diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java b/src/main/java/cokr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java index c868fa82..6850cf04 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java +++ b/src/main/java/cokr/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.getUserId()); - userScrtySetupVO.setAuthorId(this.getDefaultAuthorId(vo.getGrpId())); + userScrtySetupVO.setAuthId(this.getDefaultAuthId(vo.getGrpId())); mapper.insertUserScrtySetup(userScrtySetupVO); // 기타 option @@ -117,7 +117,7 @@ public class UserMgtServiceBean extends AbstractServiceBean implements UserMgtSe if(!Objects.equals(vo.getGrpId(), userInfoCheckMap.get("grp_id"))) { XitUserScrtySetupVO userScrtySetupVO = new XitUserScrtySetupVO(); userScrtySetupVO.setScrtySetupTrgetId(vo.getUniqId()); - userScrtySetupVO.setAuthorId(this.getDefaultAuthorId(vo.getGrpId())); + userScrtySetupVO.setAuthId(this.getDefaultAuthId(vo.getGrpId())); if(Checks.isEmpty(mapper.selectUserScrtySetup(userScrtySetupVO.getScrtySetupTrgetId()))) { mapper.insertUserScrtySetup(userScrtySetupVO); @@ -161,7 +161,7 @@ public class UserMgtServiceBean extends AbstractServiceBean implements UserMgtSe */ @Override @Transactional(readOnly = true) - public String getDefaultAuthorId(final String grpId) { + public String getDefaultAuthId(final String grpId) { if(Checks.isEmpty(grpId)) return "ROLE_USER"; XitAuthorGroupInfoVO vo = authGrpMgtMapper.selectAuthorGroupInfo(grpId); @@ -169,10 +169,10 @@ public class UserMgtServiceBean extends AbstractServiceBean implements UserMgtSe if (Checks.isEmpty(vo)) return "ROLE_USER"; else { - if (Checks.isEmpty(vo.getAuthorId())) + if (Checks.isEmpty(vo.getAuthId())) return "ROLE_USER"; else - return vo.getAuthorId(); + return vo.getAuthId(); } } @@ -212,18 +212,18 @@ public class UserMgtServiceBean extends AbstractServiceBean implements UserMgtSe }else { //사용자(수정대상) 권한 조회 XitUserScrtySetupVO scrtyVO = mapper.selectUserScrtySetup(uniqId); - String tgtAuthorId = scrtyVO.getAuthorId(); + String tgtAuthId = scrtyVO.getAuthId(); //사용자(수정자) 권한 조회 scrtyVO = mapper.selectUserScrtySetup(loginSessionVO.getUniqId());; - String userAuthorId = scrtyVO.getAuthorId(); + String userAuthId = scrtyVO.getAuthId(); //사용자(수정자)가 ROLE_ADMIN 권한의 사용자인 경우 - if("ROLE_ADMIN".equals(userAuthorId)) { + if("ROLE_ADMIN".equals(userAuthId)) { return true; }else { //사용자(수정대상)가 ROLE_ADMIN 권한의 사용자인 경우 - if("ROLE_ADMIN".equals(tgtAuthorId)) { + if("ROLE_ADMIN".equals(tgtAuthId)) { return false; } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/user/web/XitUserEtcOptMngController.java b/src/main/java/cokr/xit/fims/framework/biz/mng/user/web/XitUserEtcOptMngController.java index b8b656b3..737e7216 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/user/web/XitUserEtcOptMngController.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/user/web/XitUserEtcOptMngController.java @@ -60,7 +60,7 @@ public class XitUserEtcOptMngController extends AbstractController { /*================ * 코드목록 조회 ================*/ - model.addAttribute("dataAuthorId_result" , xitFrameCodeService.findCmmnDetailCodes("XIT401")); //자료조회및관리범위코드 목록 + model.addAttribute("dataAuthId_result" , xitFrameCodeService.findCmmnDetailCodes("XIT401")); //자료조회및관리범위코드 목록 model.addAttribute("elctrnsanctnUseYnCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT402")); //전자결재사용여부코드 목록 model.addAttribute("jobConfmAuthorYnCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT403")); //업무승인권한코드 목록 diff --git a/src/main/java/cokr/xit/fims/framework/core/XitMenuManageVO.java b/src/main/java/cokr/xit/fims/framework/core/XitMenuManageVO.java index d6dec667..65df06bb 100644 --- a/src/main/java/cokr/xit/fims/framework/core/XitMenuManageVO.java +++ b/src/main/java/cokr/xit/fims/framework/core/XitMenuManageVO.java @@ -47,7 +47,7 @@ public class XitMenuManageVO { /** 권한정보설정 */ /** 권한코드 */ - private String authorId; + private String authId; /** 기타VO변수 */ private String tempValue; diff --git a/src/main/java/cokr/xit/fims/framework/core/interceptor/MenuIntercepter.java b/src/main/java/cokr/xit/fims/framework/core/interceptor/MenuIntercepter.java index 46e11a80..429f14ee 100644 --- a/src/main/java/cokr/xit/fims/framework/core/interceptor/MenuIntercepter.java +++ b/src/main/java/cokr/xit/fims/framework/core/interceptor/MenuIntercepter.java @@ -72,7 +72,7 @@ public class MenuIntercepter extends HandlerInterceptorAdapter { } else { //익명사용자 메뉴 목록 조회 - allMenuList = CacheServiceUtils.findMenuListByAuthorId("ROLE_ANONYMOUS"); + allMenuList = CacheServiceUtils.findMenuListByAuthId("ROLE_ANONYMOUS"); } // main page만 메뉴목록 / 공지사항 조회 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 7ca36f1f..2f6c8c16 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 @@ -39,7 +39,7 @@ /* 권한 코드 */ - SELECT author_id AS code + SELECT auth_Id AS code , author_nm AS code_val FROM xit_author_info diff --git a/src/main/resources/sql/mapper/framework/cache/cachemenu-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cache/cachemenu-mysql-mapper.xml index 62bffc09..1532c574 100644 --- a/src/main/resources/sql/mapper/framework/cache/cachemenu-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cache/cachemenu-mysql-mapper.xml @@ -42,18 +42,18 @@ INNER JOIN tb_menu B ON A.menu_no = B.menu_no INNER JOIN ( - SELECT FA.author_id, FA.scrty_setup_trget_id + SELECT FA.auth_Id, FA.scrty_setup_trget_id FROM xit_user_scrty_setup FA WHERE FA.scrty_setup_trget_id = #{uniqId} ) C - ON A.author_id = C.author_id + ON A.auth_Id = C.auth_Id INNER JOIN tree_query D ON B.menu_no = D.menu_id ORDER BY D.parnt_menu_id, B.srt_ord - + /* cachemenu-mysql-mapper|selectMenuListByAuthId-권한별 메뉴 조회|julim */ SELECT D.menu_id AS "menuSid" , D.menu_name AS "menuName" @@ -72,7 +72,7 @@ ON A.menu_no = B.menu_no JOIN tree_query D ON B.menu_no = D.menu_id - WHERE A.AUTHOR_ID = #{authorId} + WHERE A.auth_Id = #{authId} ORDER BY D.parnt_menu_id, B.srt_ord 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 be8b22d0..07f540b2 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 @@ -9,14 +9,14 @@ ,GROUP_NM ,GROUP_CREAT_DE ,DSCRP - ,AUTHOR_ID + ,auth_Id FROM XIT_AUTHOR_GROUP_INFO WHERE 1=1 AND GRP_ID = #{grpId} AND GROUP_NM = #{groupNm} AND GROUP_CREAT_DE = #{groupCreatDe} AND DSCRP = #{dscrp} - AND AUTHOR_ID = #{authorId} + AND auth_Id = #{authId} /** findXitAuthorInfos */ /** 권한정보 다건 조회 */ - SELECT AUTHOR_ID + SELECT auth_Id ,AUTHOR_NM ,DSCRP ,AUTHOR_CREAT_DE FROM XIT_AUTHOR_INFO WHERE 1=1 - AND AUTHOR_ID = #{authorId} + AND auth_Id = #{authId} AND AUTHOR_NM = #{authorNm} AND DSCRP = #{dscrp} AND AUTHOR_CREAT_DE = @@ -89,24 +89,24 @@ /** addXitAuthorInfo */ /** 권한정보 등록 */ INSERT INTO XIT_AUTHOR_INFO( - AUTHOR_ID + auth_Id ,AUTHOR_NM ,DSCRP ,AUTHOR_CREAT_DE )VALUES( - #{authorId} + #{authId} ,#{authorNm} ,#{dscrp} ,DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') @@ -121,14 +121,14 @@ ,AUTHOR_NM = #{authorNm} ,DSCRP = #{dscrp} WHERE 1=1 - AND AUTHOR_ID = #{authorId} + AND auth_Id = #{authId} /** removeXitAuthorInfo */ /** 권한정보 삭제 */ DELETE FROM XIT_AUTHOR_INFO WHERE 1=1 - AND AUTHOR_ID = #{authorId} + AND auth_Id = #{authId} @@ -137,35 +137,35 @@ /** addXitAuthorRoleRelate */ /** 권한역할관계 등록 */ INSERT INTO XIT_AUTHOR_ROLE_RELATE( - AUTHOR_ID + auth_Id ,ROLE_CODE ,CREAT_DT )VALUES( - #{authorId} + #{authId} ,#{roleCode} ,NOW() ) @@ -176,7 +176,7 @@ - + @@ -184,7 +184,7 @@ /** 권한역할관계 삭제 */ DELETE FROM XIT_AUTHOR_ROLE_RELATE WHERE 1=1 - AND AUTHOR_ID = #{authorId} + AND auth_Id = #{authId} AND ROLE_CODE = #{roleCode} @@ -1317,35 +1317,35 @@ /** findXitMenuCreatDtlss */ /** 메뉴생성내역 다건 조회 */ SELECT MENU_NO - ,AUTHOR_ID + ,auth_Id ,MAPNG_CREAT_ID FROM XIT_MENU_CREAT_DTLS WHERE 1=1 AND MENU_NO = #{menuNo} - AND AUTHOR_ID = #{authorId} + AND auth_Id = #{authId} AND MAPNG_CREAT_ID = #{mapngCreatId} /** addXitMenuCreatDtls */ /** 메뉴생성내역 등록 */ INSERT INTO XIT_MENU_CREAT_DTLS( MENU_NO - ,AUTHOR_ID + ,auth_Id ,MAPNG_CREAT_ID )VALUES( #{menuNo} - ,#{authorId} + ,#{authId} ,#{mapngCreatId} ) @@ -1357,7 +1357,7 @@ MAPNG_CREAT_ID = IFNULL(#{mapngCreatId}, MAPNG_CREAT_ID) WHERE 1=1 AND MENU_NO = #{menuNo} - AND AUTHOR_ID = #{authorId} + AND auth_Id = #{authId} /** removeXitMenuCreatDtls */ @@ -1365,7 +1365,7 @@ DELETE FROM XIT_MENU_CREAT_DTLS WHERE 1=1 AND MENU_NO = #{menuNo} - AND AUTHOR_ID = #{authorId} + AND auth_Id = #{authId} @@ -2507,17 +2507,17 @@ /** findXitUserScrtySetups */ /** 사용자보안설정 다건 조회 */ SELECT SCRTY_SETUP_TRGET_ID - ,AUTHOR_ID + ,auth_Id FROM XIT_USER_SCRTY_SETUP WHERE 1=1 AND SCRTY_SETUP_TRGET_ID = #{scrtySetupTrgetId} - AND AUTHOR_ID = #{authorId} + AND auth_Id = #{authId} - + /** XitFrameUnitMapper.findMenuListByAuthId */ /** 권한코드별 메뉴 목록 조회 */ @@ -76,7 +76,7 @@ INNER JOIN tb_menu B ON A.MENU_NO = B.MENU_NO INNER JOIN TREE_QUERY D ON B.MENU_NO=D.MENU_ID WHERE 1=1 - AND A.AUTHOR_ID=#{authorId} + AND A.auth_Id=#{authId} ORDER BY D.PARNT_MENU_ID, B.srt_ord diff --git a/src/main/resources/sql/mapper/framework/cmm/XitMain-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cmm/XitMain-mysql-mapper.xml index 2fc93d92..110ffe20 100644 --- a/src/main/resources/sql/mapper/framework/cmm/XitMain-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cmm/XitMain-mysql-mapper.xml @@ -18,10 +18,10 @@ ,C.SCRTY_SETUP_TRGET_ID FROM XIT_MENU_CREAT_DTLS A INNER JOIN tb_menu B ON A.MENU_NO = B.MENU_NO - INNER JOIN (SELECT FA.AUTHOR_ID, FA.SCRTY_SETUP_TRGET_ID + INNER JOIN (SELECT FA.auth_Id, FA.SCRTY_SETUP_TRGET_ID FROM XIT_USER_SCRTY_SETUP FA WHERE FA.SCRTY_SETUP_TRGET_ID = #{tmpUniqId} - ) C ON A.AUTHOR_ID = C.AUTHOR_ID + ) C ON A.auth_Id = C.auth_Id WHERE 1=1 AND B.MENU_NO > 0 AND B.prnt_no = 0 @@ -42,10 +42,10 @@ ,(SELECT SA.URL FROM XIT_PROGRM_LIST SA WHERE B.pgrm_file_nm = SA.pgrm_file_nm) AS "chkURL" FROM XIT_MENU_CREAT_DTLS A INNER JOIN tb_menu B ON A.MENU_NO = B.MENU_NO - INNER JOIN (SELECT FA.AUTHOR_ID, FA.SCRTY_SETUP_TRGET_ID + INNER JOIN (SELECT FA.auth_Id, FA.SCRTY_SETUP_TRGET_ID FROM XIT_USER_SCRTY_SETUP FA WHERE FA.SCRTY_SETUP_TRGET_ID = #{tmpUniqId} - ) C ON A.AUTHOR_ID = C.AUTHOR_ID + ) C ON A.auth_Id = C.auth_Id WHERE 1=1 ORDER BY B.srt_ord diff --git a/src/main/resources/sql/mapper/framework/mng/auth/auth-author-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/auth/auth-author-mysql-mapper.xml index f1f51401..cc6a72c6 100644 --- a/src/main/resources/sql/mapper/framework/mng/auth/auth-author-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/auth/auth-author-mysql-mapper.xml @@ -6,14 +6,14 @@ * xit_author_info : 권한 정보 ************************************************************************************************************** --> - SELECT author_id + SELECT auth_Id , author_nm , dscrp , author_creat_de FROM xit_author_info - - AND author_id = #{authorId} + + AND auth_Id = #{authId} AND INSTR(author_nm, #{authorNm}) > 0 @@ -39,12 +39,12 @@ /* auth-author-mysql-mapper|insertAuthorInfo-권한 정보 등록|julim */ INSERT INTO xit_author_info ( - author_id + auth_Id , author_nm , dscrp , author_creat_de ) VALUES ( - #{authorId} + #{authId} ,#{authorNm} ,#{dscrp} ,DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') @@ -56,14 +56,14 @@ UPDATE xit_author_info SET author_nm = IF(author_nm = #{authorNm}, author_nm, #{authorNm}) , dscrp = IF(dscrp = #{dscrp}, dscrp, #{dscrp}) - WHERE author_id = #{authorId} + WHERE auth_Id = #{authId} /* auth-author-mysql-mapper|deleteAuthorInfos-권한 정보 삭제|julim */ DELETE FROM xit_author_info - WHERE author_id = #{authorId} + WHERE auth_Id = #{authId} @@ -78,11 +78,11 @@ , DATE_FORMAT(arr.creat_dt, '%Y%m%d%H%i%s') AS creatDt , IF(arr.role_code IS NULL, 'N', 'Y') AS "regYn" FROM xit_role_info xri - LEFT OUTER JOIN ( SELECT author_id + LEFT OUTER JOIN ( SELECT auth_Id , role_code , creat_dt FROM xit_author_role_relate - WHERE author_id = #{authorId} + WHERE auth_Id = #{authId} ) arr ON xri.role_code = arr.role_code ORDER BY arr.role_code DESC, xri.role_sort @@ -92,18 +92,18 @@ /* auth-author-mysql-mapper|deleteRoleGrant-권한 롤 삭제|julim */ DELETE FROM xit_author_role_relate - WHERE author_id = #{authorId} + WHERE auth_Id = #{authId} AND role_code = #{roleCode} /* auth-author-mysql-mapper|saveRoleGrant-권한 롤 등록|julim */ INSERT INTO xit_author_role_relate ( - author_id + auth_Id , role_code , creat_dt ) VALUES ( - #{authorId} + #{authId} , #{roleCode} , NOW() ) 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 e1c3a363..8ba12721 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 @@ -11,7 +11,7 @@ , xui.user_nm , xui.grp_id , cdc.code_val AS mberTyNm - , uss.author_id + , uss.auth_Id , IF(uss.scrty_setup_trget_id IS NULL, 'N', 'Y') AS regYn FROM ( SELECT USER_ID 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 d72dae31..996642d8 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 @@ -10,12 +10,12 @@ SELECT agi.grp_id , agi.group_nm , agi.dscrp - , agi.author_id + , agi.auth_Id , xai.author_nm , agi.group_creat_de FROM xit_author_group_info agi LEFT OUTER JOIN xit_author_info xai - ON agi.author_id = xai.author_id + ON agi.auth_Id = xai.auth_Id AND agi.group_nm = #{groupNm} @@ -28,7 +28,7 @@ SELECT grp_id , group_nm , dscrp - , author_id + , auth_Id , group_creat_de FROM xit_author_group_info WHERE grp_id = #{grpId} @@ -40,13 +40,13 @@ grp_id , group_nm , dscrp - , author_id + , auth_Id , group_creat_de )VALUES( #{grpId} , #{groupNm} , #{dscrp} - , #{authorId} + , #{authId} , DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') ) @@ -56,7 +56,7 @@ UPDATE xit_author_group_info SET group_nm = IF(group_nm = #{groupNm}, group_nm, #{groupNm}) , dscrp = IF(dscrp = #{dscrp}, dscrp, #{dscrp}) - , author_id = IF(author_id = #{authorId}, author_id, #{authorId}) + , auth_Id = IF(auth_Id = #{authId}, auth_Id, #{authId}) WHERE grp_id = #{grpId} diff --git a/src/main/resources/sql/mapper/framework/mng/auth/auth-hierarchy-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/auth/auth-hierarchy-mysql-mapper.xml index 10346ad8..cb8e9e96 100644 --- a/src/main/resources/sql/mapper/framework/mng/auth/auth-hierarchy-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/auth/auth-hierarchy-mysql-mapper.xml @@ -6,7 +6,7 @@ * xit_author_info : 권한 정보 ************************************************************************************************************** --> /** XitMenuCreateMngMapper.findUserScrtySetupByUsr */ /** 사용자별 사용자보안설정 데이터 조회 */ - SELECT AUTHOR_ID AS "authorId" + SELECT auth_Id AS "authId" FROM XIT_USER_SCRTY_SETUP WHERE SCRTY_SETUP_TRGET_ID = ( SELECT USER_ID 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 67b0528f..ec24e162 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 @@ -188,7 +188,7 @@ , group_nm , group_creat_de , dscrp - , author_id + , auth_Id FROM xit_author_group_info @@ -203,8 +203,8 @@ AND dscrp = #{dscrp} - - AND author_id = #{authorId} + + AND auth_Id = #{authId} @@ -217,14 +217,14 @@ @@ -232,7 +232,7 @@ @@ -242,17 +242,17 @@ INSERT INTO xit_user_scrty_setup ( scrty_setup_trget_id - , author_id + , auth_Id ) VALUES ( #{scrtySetupTrgetId} - , #{authorId} + , #{authId} ) /* user-mysql-mapper|updateUserScrtySetup-사용자보안설정 변경|julim */ UPDATE xit_user_scrty_setup - SET author_id = IF(author_id = #{authorId}, author_id, #{authorId}) + SET auth_Id = IF(auth_Id = #{authId}, auth_Id, #{authId}) WHERE scrty_setup_trget_id = #{scrtySetupTrgetId} 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 42e25698..c494e36d 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 @@ -147,7 +147,7 @@ return arrChecks.map((row) => { return { uniqId: row.uniqId - , authorId: row.authorId + , authId: row.authId , 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 86e913b6..a6aa293e 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 @@ -44,10 +44,10 @@ - - + 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 d0909b31..38c7fe7c 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 @@ -44,10 +44,10 @@ - - + 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 6e1dc7b2..b241d1af 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 @@ -316,7 +316,7 @@ GridConfig.setOptColumns([ //Grid 컬럼 정보(명칭,매핑 field, 기타옵 renderer: { type: XitColumnMergeRenderer, options: { - listColumns: ['authorNm', 'authorId'], + listColumns: ['authorNm', 'authId'], format: '{0}({1})' } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthHierarchyMng_edit.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthHierarchyMng_edit.jsp index 2f3eb0d6..50b26e15 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthHierarchyMng_edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthHierarchyMng_edit.jsp @@ -43,13 +43,13 @@ - - + + - +
  • - - " /> + + " />
    • @@ -83,7 +83,7 @@
  • - " /> + " />
    • @@ -263,26 +263,26 @@ $(document).ready(function(){ var i = 0; var totCnt = $('#authorRescue li').length; var sb = []; - var arrAuthorId = []; + var arrAuthId = []; $('#authorRescue li').each(function(){ if($(this).hasClass('separator')){ //구분자 일때 //배열에 담기 if(sb.length>0) - arrAuthorId.push(sb.join(';')); + arrAuthId.push(sb.join(';')); //StringBuffer 초기화 sb = []; }else{ //구분자가 아닐때 //StringBuffer에 담기 - sb.push($(this).find('#authorId').val()); + sb.push($(this).find('#authId').val()); } //마지막 요소 if(i == totCnt-1){ //배열에 담기 if(sb.length>0) - arrAuthorId.push(sb.join(';')); + arrAuthId.push(sb.join(';')); } @@ -292,13 +292,13 @@ $(document).ready(function(){ var frm = document.authHierarchyManage; //Elements 삭제 - $(frm).find('input[name="authorId"]').remove(); + $(frm).find('input[name="authId"]').remove(); //Elements 생성 - for(var i=0; i - - + + @@ -228,7 +228,7 @@ GridConfig.setOptHeader({ GridConfig.setOptColumns([ //Grid 컬럼 정보(명칭,매핑 field, 기타옵션 등) { header: '권한코드', - name: 'authorId', + name: 'authId', width: 200, sortable: true, sortingType: 'desc', diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_edit.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_edit.jsp index 542230b3..be24566c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_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/XitAuthRegMng_input.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_input.jsp index dd276396..81b7bf11 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_input.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_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/XitAuthRegMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_list.jsp index 3195ecb6..86e76b53 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_list.jsp @@ -7,8 +7,8 @@ - - + + @@ -107,13 +107,13 @@ var XitAuthRegMng_list = { alert("선택된 권한이 없습니다."); }else{ checkArr.forEach(function(item, index){ - returnValue += item.authorId; + returnValue += item.authId; if(checkArr.length -1 > index){ returnValue += ";"; } }) - document.listForm.authorIds.value = returnValue; + document.listForm.authIds.value = returnValue; XitAuthRegMng_list.removeData(); } } @@ -216,7 +216,7 @@ var XitAuthRegMng_list = { fnClickAuthRegBtn : function(props){ var rowData = props.grid.getRow(props.rowKey); var params = ""; - params += "authorId=" + rowData.authorId; + params += "authId=" + rowData.authId; XitAuthRegMng_list.pagePopup('edit', "", params); }, /* ======================== @@ -226,7 +226,7 @@ var XitAuthRegMng_list = { fnClickRoleListBtn : function(props){ var rowData = props.grid.getRow(props.rowKey); var params = ""; - params += "searchKeyword=" + rowData.authorId; + params += "searchKeyword=" + rowData.authId; XitAuthRegMng_list.pagePopup('roleList', "", params); } } @@ -295,7 +295,7 @@ GridConfig.setOptHeader({ GridConfig.setOptColumns([ //Grid 컬럼 정보(명칭,매핑 field, 기타옵션 등) { header: '권한코드', - name: 'authorId', + name: 'authId', minWidth: 200, sortable: true, sortingType: 'desc', @@ -306,7 +306,7 @@ GridConfig.setOptColumns([ //Grid 컬럼 정보(명칭,매핑 field, 기타옵 formatter : function(props){ var rowData = props.grid.getRow(props.rowKey); var obj = { - formatter : rowData.authorId + formatter : rowData.authId ,element : "text" } return obj; diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_list2.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_list2.jsp index 4248cf31..adc37ea2 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_list2.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_list2.jsp @@ -75,7 +75,7 @@ function fncManageChecked() { alert("조회된 결과가 없습니다."); } - document.listForm.authorIds.value = returnValue; + document.listForm.authIds.value = returnValue; return returnBoolean; } @@ -88,7 +88,7 @@ function fncSelectAuthorList(pageNo){ } function fncSelectAuthor(author) { - document.listForm.authorId.value = author; + document.listForm.authId.value = author; document.listForm.action = ""; document.listForm.submit(); } @@ -213,12 +213,12 @@ function press() { - " /> - ')"> + " /> + ')"> - ')">롤 정보 + ')">롤 정보 @@ -237,8 +237,8 @@ function press() { - - + + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_rolegrant_popup.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_rolegrant_popup.jsp index 76000182..e5d77edb 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_rolegrant_popup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_rolegrant_popup.jsp @@ -63,7 +63,7 @@ - "/> + "/> diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_rolegrant_popup.jsp_bak b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_rolegrant_popup.jsp_bak index 4b323ed5..b03911ce 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_rolegrant_popup.jsp_bak +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_rolegrant_popup.jsp_bak @@ -235,6 +235,6 @@ 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 2723e3b6..ecd312eb 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 @@ -9,7 +9,7 @@ - + @@ -223,7 +223,7 @@ var XitAuthUsrMng_list = { checkArr.forEach(function(item, index){ returnId += item.uniqId; - returnAuthor += item.authorId; + returnAuthor += item.authId; returnRegYn += item.regYn; returnGrpId += item.grpId; @@ -236,7 +236,7 @@ var XitAuthUsrMng_list = { }) document.listForm.userIds.value = returnId; - document.listForm.authorIds.value = returnAuthor; + document.listForm.authIds.value = returnAuthor; document.listForm.regYns.value = returnRegYn; document.listForm.grpIds.value = returnGrpId; } @@ -329,7 +329,7 @@ GridConfig.setOptColumns([ //Grid 컬럼 정보(명칭,매핑 field, 기타옵 }, { header: '권한', - name: 'authorId', + name: 'authId', width: 120, sortable: true, filter: 'select', @@ -342,7 +342,7 @@ GridConfig.setOptColumns([ //Grid 컬럼 정보(명칭,매핑 field, 기타옵 , { text: '${row.author_nm}' - ,value: '${row.author_id}' + ,value: '${row.auth_Id}' }     ] diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthUsrMng_list3.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthUsrMng_list3.jsp index d274879e..dc42aae9 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthUsrMng_list3.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthUsrMng_list3.jsp @@ -98,7 +98,7 @@ function fncManageChecked() { } document.listForm.userIds.value = returnId; - document.listForm.authorIds.value = returnAuthor; + document.listForm.authIds.value = returnAuthor; document.listForm.regYns.value = returnRegYn; @@ -248,7 +248,7 @@ function press() { @@ -281,7 +281,7 @@ function press() { - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp index 031813ee..dfe85996 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp @@ -149,7 +149,7 @@ } ,fnClickRoleListBtn : function(props){ const rowData = props.grid.getRow(props.rowKey); - const params = {roleCode: rowData.authorId} + const params = {roleCode: rowData.authId} fnBiz.pagePopup('rolePopup', "", params); } } @@ -178,7 +178,7 @@ const gridColumns = [ //Grid 컬럼 정보(명칭,매핑 field, 기타옵션 등) { header: '권한코드', - name: 'authorId', + name: 'authId', minWidth: 200, sortable: true, sortingType: 'desc', @@ -189,7 +189,7 @@ formatter : function(props){ var rowData = props.grid.getRow(props.rowKey); var obj = { - formatter : rowData.authorId + formatter : rowData.authId ,element : "text" } return obj; diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthAuthorMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthAuthorMgtPopup.jsp index 411212c0..15b8ac53 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthAuthorMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthAuthorMgtPopup.jsp @@ -2,7 +2,7 @@ <%@ include file="/WEB-INF/jsp/include/taglib.jsp" %> <%@ include file="/WEB-INF/jsp/include/fims/taglib.jsp" %> - + @@ -24,10 +24,10 @@ -   +   -   +   @@ -96,7 +96,7 @@ , remove: () => { cmmBizAjax('remove', { url: '' - , data: {authorId: $('#authorId').val()} + , data: {authId: $('#authId').val()} }); } , validate: () => { @@ -104,9 +104,9 @@ alert('변경된 내용이 없습니다.'); return false; } - if ($('#authorId').val() === '') { + if ($('#authId').val() === '') { alert('[권한코드]는 필수 입니다.'); - $('#authorId').focus(); + $('#authId').focus(); return false; } if ($('#authorNm').val() === '') { 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 1aae471c..54bf92e0 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 @@ -174,7 +174,7 @@ return arrChecks.map((row) => { return { uniqId: row.uniqId - , authorId: row.authorId + , authId: row.authId , grpId: row.grpId , regYn: row.regYn } @@ -247,7 +247,7 @@ }, { header: '권한', - name: 'authorId', + name: 'authId', width: 120, sortable: true, formatter: 'listItemText', 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 2089f984..0e6f4aef 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 @@ -206,7 +206,7 @@ renderer: { type: XitColumnMergeRenderer, options: { - listColumns: ['authorNm', 'authorId'], + listColumns: ['authorNm', 'authId'], format: '{0}({1})' } } 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 ece8b486..89a05c89 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 @@ -39,7 +39,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp index 1c3987fa..c4ae1fea 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp @@ -126,7 +126,7 @@ } const data = { - authorId: $('#authorId').val() + authId: $('#authId').val() ,grantData: arrChecks.map((row) => { return {roleCode: row.roleCode, regYn: row.regYn} }) @@ -187,7 +187,7 @@ const gridColumns = [ { header: '권한코드', - name: 'authorId', + name: 'authId', width: 200, sortable: true, sortingType: 'desc', @@ -199,7 +199,7 @@ formatter : function(props){ const rowData = props.grid.getRow(props.rowKey); return { - formatter: rowData.authorId + formatter: rowData.authId ,element: "text" } } 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 c418bd0b..d2f9d632 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 @@ -84,14 +84,14 @@ - - + + - +
  • - - "/> + + "/>
    • @@ -125,8 +125,8 @@
  • - "/> + "/>
    • @@ -153,7 +153,7 @@ /************************************************************************** * Global Variable **************************************************************************/ - let initArrAuthorId; + let initArrAuthId; let orgData; /* ******************************* @@ -162,7 +162,7 @@ const fnBiz = { save: () => { let data = $(document.authHierarchyManage).serialize(); - if (initArrAuthorId === data) { + if (initArrAuthId === data) { alert('변경된 내역이 없습니다.'); return false; } @@ -195,40 +195,40 @@ let i = 0; const totCnt = $('#authorRescue li').length; let sb = []; - const arrAuthorId = []; + const arrAuthId = []; $('#authorRescue li').each(function () { if ($(this).hasClass('separator')) { //구분자 일때 //배열에 담기 if (sb.length > 0) - // arrAuthorId.push(sb); - arrAuthorId.push(sb.join(';')); + // arrAuthId.push(sb); + arrAuthId.push(sb.join(';')); //StringBuffer 초기화 sb = []; } else { //구분자가 아닐때 - sb.push($(this).find('#authorId').val()); + sb.push($(this).find('#authId').val()); } //마지막 요소 if (i == totCnt - 1) { //배열에 담기 if (sb.length > 0) - arrAuthorId.push(sb); + arrAuthId.push(sb); } i++; }); - //if(arrAuthorId.) + //if(arrAuthId.) const frm = document.authHierarchyManage; //Elements 삭제 - $(frm).find('input[name="authorId"]').remove(); + $(frm).find('input[name="authId"]').remove(); //Elements 생성 - for (let i = 0; i < arrAuthorId.length; i++) { + for (let i = 0; i < arrAuthId.length; i++) { const param = document.createElement('input'); param.setAttribute('type', 'hidden'); - param.setAttribute('name', 'authorId'); - param.setAttribute('value', arrAuthorId[i]); + param.setAttribute('name', 'authId'); + param.setAttribute('value', arrAuthId[i]); frm.appendChild(param); } } @@ -239,7 +239,7 @@ } if ($('#grpId').val() === '') { alert('[권한그룹 ID]는 필수 입니다.'); - $('#authorId').focus(); + $('#authId').focus(); return false; } if ($('#groupNm').val() === '') { @@ -290,7 +290,7 @@ **************************************************************************/ $(document).ready(function () { fnBiz.setParam(); - initArrAuthorId = $(document.authHierarchyManage).serialize(); + initArrAuthId = $(document.authHierarchyManage).serialize(); orgData = $('form').serialize(); }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp index 27796551..7515bbcb 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp @@ -22,8 +22,8 @@ - - + + @@ -131,7 +131,7 @@ } const data = { - authorId: $('#authorId').val() + authId: $('#authId').val() ,grantData: arrChecks.map((row) => { return {roleCode: row.roleCode, regYn: row.regYn} }) diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/backup/XitMenuCreateMng_list2.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/backup/XitMenuCreateMng_list2.jsp index 6b8cde6d..d998c3e2 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/backup/XitMenuCreateMng_list2.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/backup/XitMenuCreateMng_list2.jsp @@ -43,8 +43,8 @@ function selectMenuCreatManageList() { /* ******************************************************** * 메뉴생성 화면 호출 ******************************************************** */ -function selectMenuCreat(vAuthorId) { - document.menuCreatManageForm.authorId.value = vAuthorId; +function selectMenuCreat(vAuthId) { + document.menuCreatManageForm.authId.value = vAuthId; document.menuCreatManageForm.action = ""; window.open("#", "_menuCreat", "scrollbars = yes, top=100px, left=100px, height=700px, width=850px"); document.menuCreatManageForm.target = "_menuCreat"; @@ -75,7 +75,7 @@ function selectMenuCreat(vAuthorId) {

    메뉴생성관리

    - +
    조건정보 영역 @@ -123,7 +123,7 @@ function selectMenuCreat(vAuthorId) { - + @@ -131,7 +131,7 @@ function selectMenuCreat(vAuthorId) { N - '" onclick="selectMenuCreat(''); return false;">메뉴생성 + '" onclick="selectMenuCreat(''); return false;">메뉴생성 diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuByRoleMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuByRoleMgtForm.jsp index aa305390..3d03ccf2 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuByRoleMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuByRoleMgtForm.jsp @@ -19,8 +19,8 @@ - - + + @@ -130,7 +130,7 @@ } ,onClickGrid: function(props){ const rowData = props.grid.getRow(props.rowKey); - fnBiz.pagePopup('add', {authorId: rowData.authorId}); + fnBiz.pagePopup('add', {authId: rowData.authId}); } } @@ -152,7 +152,7 @@ const gridColumns = [ { header: '권한코드', - name: 'authorId', + name: 'authId', minWidth: 250, sortable: true, sortingType: 'desc', diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuByRoleMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuByRoleMgtPopup.jsp index 7cc6c51a..880e7bfa 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuByRoleMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuByRoleMgtPopup.jsp @@ -24,8 +24,8 @@ - - + + @@ -50,9 +50,9 @@