From 48711a81fd4395b155e59e281bec4830655abcd8 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Fri, 10 Nov 2023 18:04:32 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EC=A0=84=EC=B2=B4=EB=A9=94=EB=89=B4?= =?UTF-8?q?=EC=97=90=20=EC=95=8C=EB=A6=BC=EB=A7=88=EB=8B=B9=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mnu/mpm/service/MenuManageJTreeVO.java | 10 +++++++ src/main/java/kcc/web/MainController.java | 11 ++++++-- .../sym/mnu/mcm/EgovMenuCreat_SQL_Tibero.xml | 28 +++++++++++++++++-- .../WEB-INF/jsp/web/com/webCommonHeader.jsp | 4 +-- 4 files changed, 46 insertions(+), 7 deletions(-) diff --git a/src/main/java/kcc/let/sym/mnu/mpm/service/MenuManageJTreeVO.java b/src/main/java/kcc/let/sym/mnu/mpm/service/MenuManageJTreeVO.java index 9dd9b898..25ea6daa 100644 --- a/src/main/java/kcc/let/sym/mnu/mpm/service/MenuManageJTreeVO.java +++ b/src/main/java/kcc/let/sym/mnu/mpm/service/MenuManageJTreeVO.java @@ -110,6 +110,8 @@ public class MenuManageJTreeVO implements Serializable { private String sort; //매뉴순번 + private String addMenu; //추가메뉴 - 사이트맵에 알림마당 추가하기 위한 + public String getTmp_snsId() { return tmp_snsId; } @@ -491,6 +493,14 @@ public class MenuManageJTreeVO implements Serializable { public void setSort(String sort) { this.sort = sort; } + + public String getAddMenu() { + return addMenu; + } + + public void setAddMenu(String addMenu) { + this.addMenu = addMenu; + } } \ No newline at end of file diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index 8eb97593..fe1914a4 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/src/main/java/kcc/web/MainController.java @@ -512,8 +512,14 @@ public class MainController { model.addAttribute("instrDiv", instrDiv); } - menuManageVO.setMenuUserType(menuManageVO.getMenuUserType()); - List menuResultList = menuCreateManageService.selectMenuListJtreeWeb(menuManageVO) ; + menuManageVO.setMenuUserType(menuManageVO.getMenuUserType()); + //헤더 전체메뉴에 알림마당을 추가하기 위한 작업 + //select문 selectMenuListJtreeWeb에 addmenu 변수를 이용하여 조건절에 알림마당 메뉴번호 추가 + List menuResultList = menuCreateManageService.selectMenuListJtreeWeb(menuManageVO) ; + MenuManageJTreeVO fullMenuVo = new MenuManageJTreeVO(); + fullMenuVo.setAuthorCode(menuManageVO.getAuthorCode()); + fullMenuVo.setAddMenu("9600000"); + List fullMenuResultList = menuCreateManageService.selectMenuListJtreeWeb(fullMenuVo) ; // 메인 메뉴 청소년, 성인 글 색상 적용 for(MenuManageJTreeVO empMenuManageJTreeVO : menuResultList) { @@ -551,6 +557,7 @@ public class MainController { menuManageTopVO.setMenuNo("0");*/ model.addAttribute("menuResultList", menuResultList); + model.addAttribute("fullMenuResultList", fullMenuResultList); model.addAttribute("underMenuExist", underMenuExist); model.addAttribute("underMenuEmpty", underMenuEmpty); diff --git a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Tibero.xml index d5f17272..db3f9ff1 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Tibero.xml @@ -309,7 +309,14 @@ ON A.PROGRM_FILE_NM = C.PROGRM_FILE_NM WHERE A.UPPER_MENU_NO = 0 AND A.MENU_NO !=0 - AND B.AUTHOR_CODE = #authorCode# + ]]> + + AND B.AUTHOR_CODE = #authorCode# + + + AND (B.AUTHOR_CODE = #authorCode# OR A.MENU_NO = #addMenu#) + + + + AND B.AUTHOR_CODE = #authorCode# + + + AND (B.AUTHOR_CODE = #authorCode# OR A.MENU_NO = #addMenu#) + + + + AND cc.AUTHOR_CODE = #authorCode# + + + AND (cc.AUTHOR_CODE = #authorCode# OR aa.MENU_NO = #addMenu#) + + AND (cc.AUTHOR_CODE = #authorCode# OR aa.MENU_NO = '9600000') +

한국저작권위원회 저작권 교육 시스템