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 c258f3c5..fdebed67 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 @@ -309,14 +309,19 @@ public class EgovMenuCreateManageController { // } MenuManageJTreeVO menuManageTopVO = new MenuManageJTreeVO(); menuManageTopVO.setUpperMenuId("#"); - menuManageTopVO.setMenuNo("0"); + /* menuManageTopVO.setMenuNo("0"); */ + menuManageTopVO.setMenuNo("1"); menuManageTopVO.setMenuNm("사용자메뉴"); + resultList.add(resultList.size()-4, menuManageTopVO); - if("ROLE_ADMIN".equals(menuManageVO.getAuthorCode())){ - menuManageTopVO.setMenuNm("관리자메뉴"); - } - +// if("ROLE_ADMIN".equals(menuManageVO.getAuthorCode())){ +// menuManageTopVO.setMenuNm("관리자메뉴"); +// } + menuManageTopVO = new MenuManageJTreeVO(); + menuManageTopVO.setUpperMenuId("#"); + menuManageTopVO.setMenuNo("0"); + menuManageTopVO.setMenuNm("관리자메뉴"); resultList.add(0, menuManageTopVO); System.out.println("resultList :: "+resultList); mapper.writeValue(out, resultList); @@ -340,7 +345,7 @@ public class EgovMenuCreateManageController { MenuManageVO tempMenuManageVO = new MenuManageVO(); tempMenuManageVO.setSearchKeyword(menuNo); - tempMenuManageVO.setAuthorCode(menuManageVO.getAuthorCode()); +// tempMenuManageVO.setAuthorCode(menuManageVO.getAuthorCode()); MenuManageVO resultVO = menuManageService.selectMenuManage(tempMenuManageVO); if(resultVO.getProgrmFileNm() !=null){ @@ -361,6 +366,14 @@ public class EgovMenuCreateManageController { vo.setCodeId("COM039"); List menuUserTypeList = cmmUseService.selectCmmCodeDetail(vo); model.addAttribute("menuUserTypeList", menuUserTypeList); + + + MenuManageJTreeVO menuManageJTreeVO = new MenuManageJTreeVO(); + menuManageJTreeVO.setMenuNo(menuNo); + List authorList = menuManageService.selectMenuAuthorList(menuManageJTreeVO); + + modelAndView.addObject("authorList", authorList); + modelAndView.addObject("status", "success"); return modelAndView; } diff --git a/src/main/java/kcc/let/sym/mnu/mpm/service/EgovMenuManageService.java b/src/main/java/kcc/let/sym/mnu/mpm/service/EgovMenuManageService.java index 2e203f9b..f93bfb61 100644 --- a/src/main/java/kcc/let/sym/mnu/mpm/service/EgovMenuManageService.java +++ b/src/main/java/kcc/let/sym/mnu/mpm/service/EgovMenuManageService.java @@ -170,5 +170,7 @@ public interface EgovMenuManageService { MenuManageVO selectMenuManageUrl(MenuManageVO tempMenuManageVO) throws Exception; + List selectMenuAuthorList(MenuManageJTreeVO menuManageJTreeVO) throws Exception; + } \ No newline at end of file diff --git a/src/main/java/kcc/let/sym/mnu/mpm/service/impl/EgovMenuManageServiceImpl.java b/src/main/java/kcc/let/sym/mnu/mpm/service/impl/EgovMenuManageServiceImpl.java index 19b628d4..14004193 100644 --- a/src/main/java/kcc/let/sym/mnu/mpm/service/impl/EgovMenuManageServiceImpl.java +++ b/src/main/java/kcc/let/sym/mnu/mpm/service/impl/EgovMenuManageServiceImpl.java @@ -18,6 +18,7 @@ import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; import egovframework.rte.fdl.excel.EgovExcelService; import kcc.com.cmm.ComDefaultVO; import kcc.let.sym.mnu.mpm.service.EgovMenuManageService; +import kcc.let.sym.mnu.mpm.service.MenuManageJTreeVO; import kcc.let.sym.mnu.mpm.service.MenuManageVO; import kcc.let.sym.prm.service.ProgrmManageVO; import kcc.let.sym.prm.service.impl.ProgrmManageDAO; @@ -631,4 +632,9 @@ public class EgovMenuManageServiceImpl extends EgovAbstractServiceImpl implement public MenuManageVO selectMenuManageUrl(MenuManageVO menuManageVO) throws Exception { return menuManageDAO.selectMenuManageUrl(menuManageVO); } + + @Override + public List selectMenuAuthorList(MenuManageJTreeVO menuManageJTreeVO) throws Exception { + return (List) menuManageDAO.selectMenuAuthorList(menuManageJTreeVO); + } } \ No newline at end of file diff --git a/src/main/java/kcc/let/sym/mnu/mpm/service/impl/MenuManageDAO.java b/src/main/java/kcc/let/sym/mnu/mpm/service/impl/MenuManageDAO.java index facecaa0..e8c834a2 100644 --- a/src/main/java/kcc/let/sym/mnu/mpm/service/impl/MenuManageDAO.java +++ b/src/main/java/kcc/let/sym/mnu/mpm/service/impl/MenuManageDAO.java @@ -6,6 +6,7 @@ import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; import kcc.com.cmm.ComDefaultVO; +import kcc.let.sym.mnu.mpm.service.MenuManageJTreeVO; import kcc.let.sym.mnu.mpm.service.MenuManageVO; /** * 메뉴관리, 메뉴생성, 사이트맵 생성에 대한 DAO 클래스를 정의한다. @@ -248,4 +249,10 @@ public class MenuManageDAO extends EgovAbstractDAO{ public MenuManageVO selectMenuManageUrl(MenuManageVO menuManageVO) throws Exception{ return (MenuManageVO)select("menuManageDAO.selectMenuManageUrl", menuManageVO); } + + public List selectMenuAuthorList(MenuManageJTreeVO menuManageJTreeVO) throws Exception{ + return (List)list("menuManageDAO.selectMenuAuthorList", menuManageJTreeVO); + } + + } \ No newline at end of file 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 7f30d3d2..6dace52c 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 @@ -208,7 +208,7 @@ + + \ No newline at end of file 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 152a3e0a..b7de535f 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 @@ -79,14 +79,14 @@ , MENU_TYPE AS menuType /*, '' AS menuCours*/ , getMenuCours(A.MENU_NO) AS menuCours - , B.AUTHOR_CODE AS authorCode + + , A.EMPLYR_ID AS emplyrId + , C.USER_NM AS emplyrIdTxt FROM LETTNMENUINFO A - LEFT JOIN LETTNMENUCREATDTLS B ON A.MENU_NO= B.MENU_NO + LEFT JOIN LETTNEMPLYRINFO C ON A.EMPLYR_ID = C.EMPLYR_ID WHERE 1=1 @@ -97,9 +97,9 @@ AND A.PROGRM_FILE_NM = #searchKeyword# - /* 매뉴사용여부 조회 */ + 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 3c2d984e..40e9b50d 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 @@ -49,6 +49,7 @@ function jstreeInit() { "url" : "", "dataType" : "json", "data" : function (node) { + console.log("node.id :: ", node.id); return {'id' : node.id, 'authorCode' : $('#authorCode').val() }; } } @@ -77,7 +78,10 @@ function jstreeInit() { ] }) .bind('loaded.jstree', function(e, data) { - $('#itn_organization').jstree('open_node' , $('#0') ) + $('#itn_organization').jstree('open_node' , $('#0') ); + + var tree = $.jstree.reference('itn_organization'); + tree.select_node(tree.get_node('#').children[0]); }) .on('select_node.jstree', function (e, data) { if(!$('.organ_rightbox').is(":visible")){ @@ -116,7 +120,8 @@ function jstreeInit() { if (status == "success") { var menuManageVO = returnData.menuManageVO; var menuUserTypeList = returnData.menuUserTypeList; - fn_select_menuNo(menuManageVO, menuUserTypeList); + var authorList = returnData.authorList; + fn_select_menuNo(menuManageVO, menuUserTypeList, authorList); } else { alert("ERROR"); } }, error : function(request , status, error) { @@ -282,22 +287,8 @@ $( document ).ready(function() { jstreeInit(); }); -//직원 상세 초기화 -function fn_add_emp() { - var partIdx =$("#selectPartIdx").val(); - var upperIdxs = $("#selectPartParents").val(); - - // 직원 상세 초기화 - document.empInfForm.reset(); - $("#empFormTitle").text("메뉴 추가등록 상세"); - $("input[name='paIdx']").val(""); - - fn_set_emp_part(partIdx, upperIdxs); -} - - //메뉴 정보 세팅 -function fn_select_menuNo(menuManageVO, menuUserTypeList){ +function fn_select_menuNo(menuManageVO, menuUserTypeList, authorList){ var tmpHtml = ""; if(menuManageVO!=null){ $('#menuNo').val(menuManageVO.menuNo); @@ -366,7 +357,25 @@ function fn_select_menuNo(menuManageVO, menuUserTypeList){ if(""!=menuManageVO.progrmHtmlFileId){ $('#htmlComfirm').show(); $('#a_contentLink').attr("onclick" , "htmlComfirm('"+menuManageVO.progrmHtmlFileId+"');") - } + } + + if(menuManageVO.menuNo > 10){ + $('#menuOpen').show(); + var checkField = $("input[name=checkField]"); + + $("input[name=checkField]").prop('checked', false); + + for(var i = 0 ; i < checkField.size() ; i++){ + for(var j = 0 ; j < authorList.length ; j++){ + if(checkField[i].id == authorList[j].authorCode){ + checkField[i].checked = true; + } + } + } + }else{ + $('#menuOpen').hide(); + } + } } @@ -945,13 +954,21 @@ function set_bbs(){ - + 메뉴노출 - + + + <%-- + --%> + +
+ <%-- + --%> + " title="Check " type="checkbox"/> + +
+