From bbf274b1d2aa1d9d6250326b2d9e22ff7a2e072d Mon Sep 17 00:00:00 2001
From: JIWOO <dlwldn1024@iten.co.kr>
Date: Thu, 26 Sep 2024 10:44:47 +0900
Subject: [PATCH 1/3] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20build=20?=
 =?UTF-8?q?=EC=8B=9C=20file=20name=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1ebf6c50..6c43b4a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -342,11 +342,11 @@
 		    <version>3.16</version>
 		</dependency>
 		
-		<!--<dependency>
+		<dependency>
 		    <groupId>org.apache.poi</groupId>
 		    <artifactId>poi-ooxml</artifactId>
 		    <version>3.16</version>
-		</dependency>-->
+		</dependency>
 		
 		<!-- 자동완성기능 gson 사용 -->
 		<dependency>
@@ -489,11 +489,11 @@
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
-		<dependency>
+		<!-- <dependency>
 		    <groupId>org.apache.poi</groupId>
 		    <artifactId>poi-ooxml</artifactId>
 		    <version>3.9</version>
-		</dependency>
+		</dependency> -->
 
 
 		

From 102423f7c496c5e546b245560cb317201a7e9059 Mon Sep 17 00:00:00 2001
From: JIWOO <dlwldn1024@iten.co.kr>
Date: Thu, 26 Sep 2024 11:52:49 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20build=20?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6c43b4a5..9975f72f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -502,7 +502,7 @@
     <build>
         <defaultGoal>install</defaultGoal>
         <directory>${basedir}/target</directory>
-		<finalName>ROOT</finalName>
+		<finalName>fairnet</finalName>
         <pluginManagement>
             <plugins>
                 <plugin>

From 600e09e28b0dade3e7deec7709288b45e2eea8b6 Mon Sep 17 00:00:00 2001
From: tolag3 <tolag3@gmail.com>
Date: Thu, 26 Sep 2024 15:19:08 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=ED=97=A4=EB=8D=94=20=EB=A9=94=EB=89=B4=20?=
 =?UTF-8?q?=EB=A7=81=ED=81=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mnu/mpm/service/MenuManageJTreeVO.java    | 11 ++++
 src/main/java/kcc/web/MainController.java     |  2 +-
 .../WEB-INF/jsp/web/com/webCommonHeader.jsp   | 45 ++++---------
 .../WEB-INF/jsp/web/com/webCommonLeftMenu.jsp | 63 ++++++++-----------
 4 files changed, 49 insertions(+), 72 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 bf9136a3..57bf012e 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
@@ -108,6 +108,8 @@ public class MenuManageJTreeVO implements Serializable {
    
    String [] codeArry = null;  //즐겨찾기 리스트 배열 받기
    
+   private Integer childMenuCnt;
+   
 	public String getTmp_snsId() {
 	return tmp_snsId;
 	}
@@ -481,6 +483,15 @@ public class MenuManageJTreeVO implements Serializable {
 	public void setDepth(String depth) {
 		this.depth = depth;
 	}
+
+	public Integer getChildMenuCnt() {
+		return childMenuCnt;
+	}
+
+	public void setChildMenuCnt(Integer childMenuCnt) {
+		this.childMenuCnt = childMenuCnt;
+	}
+	
     
 	
 }
\ 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 f877c0bf..f5c40efa 100644
--- a/src/main/java/kcc/web/MainController.java
+++ b/src/main/java/kcc/web/MainController.java
@@ -290,7 +290,7 @@ public class MainController {
 		}
 
 		List<MenuManageJTreeVO> menuResultList = menuCreateManageService.selectMenuListJtreeWeb(menuManageVO);
-
+		
 		model.addAttribute("menuResultList", menuResultList);
 
 		return "web/com/webCommonHeader";
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 5c185a70..9fc3fa59 100644
--- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
@@ -36,6 +36,13 @@
 	function zooms() {
 		document.body.style.zoom = nowZoom + "%";
 	}
+	
+	function depthTwoClick(obj){
+		var url = $($(obj).parent().find('ul.menu_depth03 li:first-child a')).attr('href');
+		if(typeof url != 'undefined'){
+			location.href = $($(obj).parent().find('ul.menu_depth03 li:first-child a')).attr('href');
+		}
+	}
 
 </script>
 
@@ -85,8 +92,10 @@
 									<ul class="sub_menu_ul">
 										<c:forEach var="resultListTwo" items="${menuResultList}" varStatus="status"> 
 											<c:if test="${resultListTwo.depths eq '2' && resultListOne.menuNo  eq resultListTwo.upperMenuId }">
-												<li class="menu_depth02">
-													<a href="#" class="sub_menu_title"><c:out value="${resultListTwo.menuNm}" /></a>
+												<li class="menu_depth02" id="depthTwo">
+													<a href="${resultListTwo.menuType ne 'M' ? resultListTwo.url : '#'}" class="sub_menu_title" <c:if test ="${resultListTwo.menuType eq 'M'}"> onclick="depthTwoClick(this); return false;"</c:if>>
+														<c:out value="${resultListTwo.menuNm}" />
+													</a>
 													<ul class="menu_depth03">
 														<c:forEach var="resultListThree" items="${menuResultList}" varStatus="status"> 
 															<c:if test="${resultListThree.depths eq '3' && resultListTwo.menuNo  eq resultListThree.upperMenuId }">
@@ -113,36 +122,6 @@
 			</button>
 		</div>
 	</nav>
-	<!-- 전체메뉴 -->
-	<!-- <div class="full_menu">
-		<div class="inner">
-			<h1 class="logo"><img src="/kccadrPb/usr/image/common/top_logo.png"
-					alt="저작권 전자조정시스템 Copyright Electronic Coordination System"></h1>
-			<ul class="depth01">
-				<c:forEach var="resultListOne" items="${menuResultList}" varStatus="status">
-				<c:if test="${resultListOne.depths eq '1' }">
-				<li class="depth01_li">
-					<a href="#" class="menu_link">
-						<c:out value="${resultListOne.menuNm}" />
-					</a>
-					<ul class="depth02">
-						<c:forEach var="resultListTwo" items="${menuResultList}" varStatus="status"> 
-						<c:if test="${resultListTwo.depths eq '2' && resultListOne.menuNo  eq resultListTwo.upperMenuId }">
-						<li>
-							<a href="${empty resultListTwo.url ? '#' : resultListTwo.url }" ${resultListTwo.menuType eq 'O' ? 'target="_blank"' : ""} >
-								<c:out value="${resultListTwo.menuNm}" />
-							</a>
-						</li>
-						</c:if>
-						</c:forEach>
-					</ul>
-				</li>
-				</c:if>
-				</c:forEach>
-			</ul>
-			<button type="button" class="btn_close" title="전체메뉴 닫기"></button>
-		</div>
-	</div> -->
 	<!-- //전체메뉴 -->
 	<div class="mobile_header">
 		<div class="header_wrap">
@@ -165,7 +144,7 @@
 		<div class="all_menu_wrap">
 			<div class="top_area">
 				<h1 class="logo">
-					<a href="./index.html" title="메인으로 이동">
+					<a href="/" title="메인으로 이동">
 						<img src="/kofair_case_seed/usr/images/layout/header_logo_m.png" alt="한국공정거래조정원 KOREA FAIR TRADE MEDIATION AGENCY">
 					</a>
 				</h1>
diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonLeftMenu.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonLeftMenu.jsp
index 9fa30322..1a7aa9ae 100644
--- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonLeftMenu.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonLeftMenu.jsp
@@ -17,30 +17,17 @@
 		<c:forEach var="listDep2" items="${whereAmIList}" varStatus="status1">
 			<c:if test="${listDep2.depth eq '2'}">
  				
- 				<c:choose>
-					<c:when test="${activeYn eq 'N'}">
-		 				<li class="active">
-					</c:when>
-					<c:otherwise>
-		 				<li>
-					</c:otherwise>
-				</c:choose>
- 				
-				<c:forEach var="findDep2" items="${whereAmIList}" varStatus="status2">
-					<c:if test="${listDep2.depth eq '2'}">
-						<c:choose>
-							<c:when test="${activeYn eq 'N'}">
-								<c:choose>
-									<c:when test="${menuManageVO.menuNo eq findDep2.menuNo}">
-										<c:set var="activeYn" value="Y"/>
-									</c:when>
-								</c:choose>
-							</c:when>
-						</c:choose>
-					</c:if>
-				</c:forEach>
-				
-					<a href="#none" class="lnb_menu_title">
+ 				<li <c:if test="${activeYn eq 'N'}">class="active"</c:if>>
+					<c:forEach var="findDep2" items="${whereAmIList}" varStatus="status2">
+						<c:if test="${
+										listDep2.depth eq '2' 
+										&& activeYn eq 'N' 
+										&& menuManageVO.menuNo eq findDep2.menuNo
+									}">
+							<c:set var="activeYn" value="Y"/>
+						</c:if>
+					</c:forEach>
+					<a href="${listDep2.menuType ne 'M' ? listDep2.url : '#none'}" class="lnb_menu_title" >
 						<c:out value="${listDep2.menuNm}"/>
 						<c:forEach var="depth2CntList" items="${depth2CntList}" varStatus="status4">
 							<c:if test="${
@@ -51,21 +38,21 @@
 							</c:if>
 						</c:forEach>
 					</a>
-					<c:forEach var="listDep3" items="${whereAmIList}" varStatus="status3">
-						<c:if test="${status3.count eq 1}">
+					<c:forEach var="depth2CntList" items="${depth2CntList}" varStatus="status4">
+						<c:if test="${
+										depth2CntList.menuNo eq listDep2.menuNo 
+										&& depth2CntList.cnt gt 0
+									}">
 							<ul class="lnb_sub_menu">
-						</c:if>
-						<c:if test="${listDep3.upperMenuId eq listDep2.menuNo}">
-							<c:choose>
-								<c:when test="${listDep3.menuNo eq menuManageVO.menuNo}">
-									<li><a href="#" class="active" onclick="location.href='${listDep3.url}'"><c:out value="${listDep3.menuNm}"/></a></li>
-								</c:when>
-								<c:otherwise>
-									<li><a href="#" onclick="location.href='${listDep3.url}'"><c:out value="${listDep3.menuNm}"/></a></li>
-								</c:otherwise>
-							</c:choose>
-						</c:if>
-						<c:if test="${status3.count eq whereAmIList.size()}">
+								<c:forEach var="listDep3" items="${whereAmIList}" varStatus="status3">
+									<c:if test="${listDep3.upperMenuId eq listDep2.menuNo}">
+										<li>
+											<a href="#" <c:if test="${listDep3.menuNo eq menuManageVO.menuNo}">class="active"</c:if> onclick="location.href='${listDep3.url}'">
+												<c:out value="${listDep3.menuNm}"/>
+											</a>
+										</li>
+									</c:if>
+								</c:forEach>
 							</ul>
 						</c:if>
 					</c:forEach>