From 8585f882839bd76a87bd9af6416424dbbde88a56 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Thu, 26 Sep 2024 18:10:48 +0900 Subject: [PATCH] Merge branch 'master' of http://tolag3@vcs.iten.co.kr:9999/itnAdmin/fairnet MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 헤더 수정 --- src/main/java/kcc/web/MainController.java | 19 ++ .../WEB-INF/jsp/web/com/webCommonHeader.jsp | 227 ++++-------------- 2 files changed, 69 insertions(+), 177 deletions(-) diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index f5c40efa..d9d8660b 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/src/main/java/kcc/web/MainController.java @@ -290,8 +290,11 @@ public class MainController { } List menuResultList = menuCreateManageService.selectMenuListJtreeWeb(menuManageVO); + menuDepth2ChildCnt(menuResultList); model.addAttribute("menuResultList", menuResultList); + + return "web/com/webCommonHeader"; } @@ -1207,4 +1210,20 @@ public class MainController { // charset=utf-8"); //줄바꿈이 필요해서 return mbp; } + + private void menuDepth2ChildCnt(List menuResultList) { + + for(MenuManageJTreeVO tmpVO : menuResultList.stream().filter(t -> "2".equals(t.getDepths())).collect(Collectors.toList())) { + + tmpVO.setChildMenuCnt( + new Long(menuResultList.stream() + .filter( t -> + tmpVO.getMenuNo().equals(t.getUpperMenuId()) + ) + .count()) + .intValue() + ); + } + } + } diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp index 9fc3fa59..622cfbea 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -39,8 +39,11 @@ function depthTwoClick(obj){ var url = $($(obj).parent().find('ul.menu_depth03 li:first-child a')).attr('href'); + if($(obj).parents('[class]').first().attr('class') == 'm_sub_menu'){ + url = $($(obj).parent().find('ul.m_sub_depth02 li:first-child a')).attr('href'); + } if(typeof url != 'undefined'){ - location.href = $($(obj).parent().find('ul.menu_depth03 li:first-child a')).attr('href'); + location.href = url; } } @@ -92,21 +95,23 @@