diff --git a/src/main/java/kcc/let/sec/ram/service/EgovAuthorManageService.java b/src/main/java/kcc/let/sec/ram/service/EgovAuthorManageService.java index 2c13ae7d..135ca6e5 100644 --- a/src/main/java/kcc/let/sec/ram/service/EgovAuthorManageService.java +++ b/src/main/java/kcc/let/sec/ram/service/EgovAuthorManageService.java @@ -116,4 +116,6 @@ public interface EgovAuthorManageService { */ public void deleteLettnrolesHierarchy(AuthorManage authorManage) throws Exception; + public List selectAuthorLists() throws Exception; + } diff --git a/src/main/java/kcc/let/sec/ram/service/impl/AuthorManageDAO.java b/src/main/java/kcc/let/sec/ram/service/impl/AuthorManageDAO.java index b4761757..dfb49ca7 100644 --- a/src/main/java/kcc/let/sec/ram/service/impl/AuthorManageDAO.java +++ b/src/main/java/kcc/let/sec/ram/service/impl/AuthorManageDAO.java @@ -158,4 +158,9 @@ public class AuthorManageDAO extends EgovAbstractDAO { public void deleteLettnrolesHierarchy(AuthorManage authorManage) throws Exception { delete("authorManageDAO.deleteLettnrolesHierarchy", authorManage); } + + @SuppressWarnings("unchecked") + public List selectAuthorLists() throws Exception { + return (List) list("authorManageDAO.selectAuthorLists"); + } } diff --git a/src/main/java/kcc/let/sec/ram/service/impl/EgovAuthorManageServiceImpl.java b/src/main/java/kcc/let/sec/ram/service/impl/EgovAuthorManageServiceImpl.java index 6bf9d5af..d0d877cb 100644 --- a/src/main/java/kcc/let/sec/ram/service/impl/EgovAuthorManageServiceImpl.java +++ b/src/main/java/kcc/let/sec/ram/service/impl/EgovAuthorManageServiceImpl.java @@ -159,4 +159,8 @@ public class EgovAuthorManageServiceImpl extends EgovAbstractServiceImpl impleme public void deleteLettnrolesHierarchy(AuthorManage authorManage) throws Exception { authorManageDAO.deleteLettnrolesHierarchy(authorManage); } + + public List selectAuthorLists() throws Exception { + return authorManageDAO.selectAuthorLists(); + } } diff --git a/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java b/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java index 96e50d6b..1ce5623f 100644 --- a/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java +++ b/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java @@ -32,6 +32,8 @@ import kcc.com.cmm.LoginVO; import kcc.com.cmm.service.EgovCmmUseService; import kcc.let.cop.bbs.service.BoardMasterVO; import kcc.let.cop.bbs.service.EgovBBSAttributeManageService; +import kcc.let.sec.ram.service.AuthorManageVO; +import kcc.let.sec.ram.service.EgovAuthorManageService; import kcc.let.sym.ccm.cde.service.CmmnDetailCodeVO; import kcc.let.sym.mnu.mcm.service.EgovMenuCreateManageService; import kcc.let.sym.mnu.mcm.service.MenuCreatVO; @@ -106,6 +108,9 @@ public class EgovMenuCreateManageController { @Resource(name = "egovCntManageService") private EgovCntManageService egovCntManageService; + @Resource(name = "egovAuthorManageService") + private EgovAuthorManageService egovAuthorManageService; + /** * *메뉴생성목록을 조회한다. * @@ -245,7 +250,10 @@ public class EgovMenuCreateManageController { if(null == menuManageVO.getAuthorCode()) { menuManageVO.setAuthorCode("ROLE_ANONYMOUS"); } + List authorList = egovAuthorManageService.selectAuthorLists(); + model.addAttribute("menuCreatVO", menuCreatVO); + model.addAttribute("authorList", authorList); return "sym/mnu/mpm/EgovMenuCreatSelectJtree"; } @@ -635,12 +643,12 @@ public class EgovMenuCreateManageController { } //프로그램 파일명에 등록된 menuNO 게시판,컨텐츠 삭제 - { - CntManageVO tempCntManageVO = new CntManageVO(); - tempCntManageVO.setMenuNo(menuManageVO.getMenuNo()+""); - egovCntManageService.deleteMenuNo(tempCntManageVO) ; - - } +// { +// CntManageVO tempCntManageVO = new CntManageVO(); +// tempCntManageVO.setMenuNo(menuManageVO.getMenuNo()+""); +// egovCntManageService.deleteMenuNo(tempCntManageVO) ; +// +// } if("B".equals(menuManageVO.getMenuType())){ //단일 게시판 선택시에 마스터 테이블에 메뉴번호를 넣어준다. solr 검색을 위해. BoardMasterVO boardMasterVO = new BoardMasterVO(); @@ -654,6 +662,7 @@ public class EgovMenuCreateManageController { CntManageVO tempCntManageVO = new CntManageVO(); tempCntManageVO.setMenuNo(menuManageVO.getMenuNo()+""); tempCntManageVO.setCntId(progrmManageVO.getProgrmHtmlFileId()); + egovCntManageService.deleteMenuNo(tempCntManageVO) ; egovCntManageService.updateMenuContent(tempCntManageVO); } modelAndView.addObject("status", "success"); diff --git a/src/main/java/kcc/let/uat/uia/service/impl/EgovSessionMapping.java b/src/main/java/kcc/let/uat/uia/service/impl/EgovSessionMapping.java index aaa2ae4a..cdd489ad 100644 --- a/src/main/java/kcc/let/uat/uia/service/impl/EgovSessionMapping.java +++ b/src/main/java/kcc/let/uat/uia/service/impl/EgovSessionMapping.java @@ -66,7 +66,7 @@ public class EgovSessionMapping extends EgovUsersByUsernameMapping { /*String strMberSeq = rs.getString("mber_seq"); String ofcpsNm = rs.getString("ofcps_nm");*/ - String offmTelno = rs.getString("offm_telno").toString(); +// String offmTelno = rs.getString("offm_telno").toString(); // 세션 항목 설정 @@ -86,7 +86,7 @@ public class EgovSessionMapping extends EgovUsersByUsernameMapping { /*20221012 대시보드를 위해 직급 코드 추가*/ /*loginVO.setOfcpsNm(ofcpsNm);*/ - loginVO.setPhone(offmTelno); +// loginVO.setPhone(offmTelno); return new EgovUserDetails(strUserId, strPassWord, strEnabled, loginVO); } diff --git a/src/main/resources/egovframework/sqlmap/let/sec/ram/EgovAuthorManage_SQL_Oracle.xml b/src/main/resources/egovframework/sqlmap/let/sec/ram/EgovAuthorManage_SQL_Oracle.xml index 38270bdc..0558528a 100644 --- a/src/main/resources/egovframework/sqlmap/let/sec/ram/EgovAuthorManage_SQL_Oracle.xml +++ b/src/main/resources/egovframework/sqlmap/let/sec/ram/EgovAuthorManage_SQL_Oracle.xml @@ -176,4 +176,16 @@ ]]> + + diff --git a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Oracle.xml b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Oracle.xml index db3f9ff1..7f30d3d2 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Oracle.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Oracle.xml @@ -207,7 +207,7 @@ diff --git a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Oracle.xml b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Oracle.xml index 2cfd6d28..152a3e0a 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Oracle.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Oracle.xml @@ -1,5 +1,5 @@ - + @@ -65,7 +65,7 @@ @@ -290,18 +285,27 @@ - UPDATE LETTNMENUINFO A , - ( SELECT ROW_NUMBER() OVER(ORDER BY MENU_ORDR, LAST_UPDT_PNTTM - - DESC - - ) AS SORT1 , A.MENU_NO FROM LETTNMENUINFO A LEFT JOIN LETTNMENUCREATDTLS B - ON A.MENU_NO= B.MENU_NO - WHERE A.UPPER_MENU_NO = #upperMenuId# - AND B.AUTHOR_CODE = #authorCode# - ORDER BY MENU_ORDR ASC ) B - SET A.MENU_ORDR = B.SORT1 - WHERE A.MENU_NO = B.MENU_NO + UPDATE LETTNMENUINFO A + SET A.MENU_ORDR = + (SELECT SORT1 + FROM + (SELECT ROW_NUMBER() OVER (ORDER BY AA1.MENU_ORDR, AA1.LAST_UPDT_PNTTM + + DESC + + ) AS SORT1 + , AA1.MENU_NO + FROM LETTNMENUINFO AA1 + LEFT JOIN LETTNMENUCREATDTLS B ON AA1.MENU_NO = B.MENU_NO + WHERE AA1.UPPER_MENU_NO = #upperMenuId# + AND B.AUTHOR_CODE = #authorCode#) Subquery + WHERE Subquery.MENU_NO = A.MENU_NO) + WHERE EXISTS ( SELECT 1 + FROM LETTNMENUINFO AA1 + LEFT JOIN LETTNMENUCREATDTLS B ON AA1.MENU_NO = B.MENU_NO + WHERE AA1.UPPER_MENU_NO = #upperMenuId# + AND B.AUTHOR_CODE = #authorCode# + AND AA1.MENU_NO = A.MENU_NO) diff --git a/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp b/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp index 42a32029..3c2d984e 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp @@ -39,7 +39,7 @@ */ var newNodeId = ""; function jstreeInit() { - $('#kopost_organization').jstree({ + $('#itn_organization').jstree({ "core" : { "animation" : 0, "multiple" : false, @@ -77,7 +77,7 @@ function jstreeInit() { ] }) .bind('loaded.jstree', function(e, data) { - $('#kopost_organization').jstree('open_node' , $('#0') ) + $('#itn_organization').jstree('open_node' , $('#0') ) }) .on('select_node.jstree', function (e, data) { if(!$('.organ_rightbox').is(":visible")){ @@ -377,7 +377,7 @@ function fn_delete_menuInfo(menuNo , progrmFileNm ) { return ; } - var instance = $('#kopost_organization').jstree(true); + var instance = $('#itn_organization').jstree(true); if(instance.get_node(menuNo).children.length != 0){ alert("하위 메뉴를 먼저 삭제 후 메뉴를 삭제해 주세요."); return; @@ -393,10 +393,10 @@ function fn_delete_menuInfo(menuNo , progrmFileNm ) { success : function(returnData, status) { if (returnData.status == "success") { // 직원 목록 갱신 - var instance = $('#kopost_organization').jstree(true); + var instance = $('#itn_organization').jstree(true); //$("#" + instance.get_node(partIdx).a_attr.id).trigger("click"); alert("메뉴 정보가 삭제 되었습니다."); - $("#kopost_organization").jstree("refresh"); + $("#itn_organization").jstree("refresh"); fn_init_menuInfo(); } else if(returnData.status == "duplPk"){ alert("삭제하려는 메뉴를 참조하고 있는 메뉴가 있습니다.\n 참조하는 메뉴를 삭제후 다시 시도해 주세요\n"+ "("+returnData.menuManageResultVO.menuCours+")"); @@ -484,7 +484,7 @@ function fn_save_menuInfo(menuNo) { success : function(returnData, status) { if (returnData.status == "success") { alert("메뉴 정보가 저장 되었습니다."); - var instance = $('#kopost_organization').jstree(true); + var instance = $('#itn_organization').jstree(true); $('#'+instance.get_node($('#tmp_Id').val()).a_attr.id).trigger("click");//이전 메뉴id선택되게 $('#tmp_Id').val($('#menuNo').val()); } else if(returnData.status == "upperDupl"){ @@ -504,7 +504,7 @@ function fn_save_menuInfo(menuNo) { alert("메뉴 정보 저장이 실패되었습니다."); }, complete : function () { - $("#kopost_organization").jstree("refresh"); + $("#itn_organization").jstree("refresh"); deleteLodingBar(); } }); @@ -542,9 +542,9 @@ function initShowUrl(init){ $("#url").attr("readonly", false); } if(init=='N'){ - var instance = $('#kopost_organization').jstree(true); - if($('#kopost_organization').jstree('get_selected')[0] != null){ - if(instance.get_node($('#kopost_organization').jstree('get_selected')[0]).children.length != 0){ + var instance = $('#itn_organization').jstree(true); + if($('#itn_organization').jstree('get_selected')[0] != null){ + if(instance.get_node($('#itn_organization').jstree('get_selected')[0]).children.length != 0){ alert("하위 메뉴가 있을경우는 다른타입으로 변경할수 없습니다."); return; } @@ -827,18 +827,21 @@ function set_bbs(){