tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'JIWOO' into advc

Browse Source
This commit is contained in:
jiwoo 2023-11-10 18:06:04 +09:00
commit 5de1484766
4 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/kcc/let/sym/mnu/mpm/service/MenuManageJTreeVO.java
View File

@ -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;
}
}

11
src/main/java/kcc/web/MainController.java
View File

@ -512,8 +512,14 @@ public class MainController {
model.addAttribute("instrDiv", instrDiv);
}
menuManageVO.setMenuUserType(menuManageVO.getMenuUserType());
List<MenuManageJTreeVO> menuResultList = menuCreateManageService.selectMenuListJtreeWeb(menuManageVO) ;
menuManageVO.setMenuUserType(menuManageVO.getMenuUserType());
//헤더 전체메뉴에 알림마당을 추가하기 위한 작업
//select문 selectMenuListJtreeWeb에 addmenu 변수를 이용하여 조건절에 알림마당 메뉴번호 추가
List<MenuManageJTreeVO> menuResultList = menuCreateManageService.selectMenuListJtreeWeb(menuManageVO) ;
MenuManageJTreeVO fullMenuVo = new MenuManageJTreeVO();
fullMenuVo.setAuthorCode(menuManageVO.getAuthorCode());
fullMenuVo.setAddMenu("9600000");
List<MenuManageJTreeVO> 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);

28
src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Tibero.xml
View File

@ -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#
]]>
<isEmpty property="addMenu">
AND B.AUTHOR_CODE = #authorCode#
</isEmpty>
<isNotEmpty property="addMenu">
AND (B.AUTHOR_CODE = #authorCode# OR A.MENU_NO = #addMenu#)
</isNotEmpty>
<![CDATA[
/*
AND A.MENU_NO != '9050001' 사용자 메인페이지 */
/*
@ -360,7 +367,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#
]]>
<isEmpty property="addMenu">
AND B.AUTHOR_CODE = #authorCode#
</isEmpty>
<isNotEmpty property="addMenu">
AND (B.AUTHOR_CODE = #authorCode# OR A.MENU_NO = #addMenu#)
</isNotEmpty>
<![CDATA[
/*
AND A.MENU_NO != '9050001' 사용자 메인페이지 */
/*
@ -373,7 +387,15 @@
WHERE aa.MENU_NO=bb.upper_menu_no
AND bb.menu_no=cc.menu_no
AND cc.AUTHOR_CODE = #authorCode#
]]>
<isEmpty property="addMenu">
AND cc.AUTHOR_CODE = #authorCode#
</isEmpty>
<isNotEmpty property="addMenu">
AND (cc.AUTHOR_CODE = #authorCode# OR aa.MENU_NO = #addMenu#)
</isNotEmpty>
AND (cc.AUTHOR_CODE = #authorCode# OR aa.MENU_NO = '9600000')
<![CDATA[
AND cc.use_yn='Y'
AND bb.PROGRM_FILE_NM = dd.PROGRM_FILE_NM

4
src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
View File

@ -332,14 +332,14 @@ function usrJoin(){
<div class="inner">
<h1 class="logo"><img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/common/ci.png" alt="한국저작권위원회 저작권 교육 시스템"></h1>
<ul class="depth01">
<c:forEach var="resultListOne" items="${menuResultList}" varStatus="status">
<c:forEach var="resultListOne" items="${fullMenuResultList}" varStatus="status">
<c:if test="${resultListOne.depths eq '1' }">
<li class="depth01_li">
<a href="#" class="menu_link" id="full_${resultListOne.menuNo}">
<c:out value="${resultListOne.menuNm}" escapeXml="false" />
</a>
<ul class="depth02">
<c:forEach var="resultListTwo" items="${menuResultList}" varStatus="status">
<c:forEach var="resultListTwo" items="${fullMenuResultList}" varStatus="status">
<c:if test="${resultListTwo.depths eq '2' && resultListOne.menuNo eq resultListTwo.upperMenuId }">
<li>
<a href="${pageContext.request.contextPath}${empty resultListTwo.url ? '#' : resultListTwo.url }" ${resultListTwo.menuType eq 'O' ? 'target="_blank"' : ""} >