From 2c6d567c0bdcc81d13d501f77a718f57b68b0a3b Mon Sep 17 00:00:00 2001
From: name <mail>
Date: Thu, 27 Jul 2023 14:49:08 +0900
Subject: [PATCH] =?UTF-8?q?=EC=84=A0=EA=B1=B0=EB=AC=B8=EC=9E=90=20?=
 =?UTF-8?q?=EB=8B=A8=EC=B2=B4=EB=AC=B8=EC=9E=90=20=ED=99=94=EB=A9=B4=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/MjonMsgCampainDataController.java           | 10 +++++++++-
 .../jsp/web/msgcampain/excel/MsgExcelDataView.jsp   | 13 ++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java
index 5f6da597..d83b6d70 100644
--- a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java
+++ b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java
@@ -843,7 +843,13 @@ public class MjonMsgCampainDataController {
 		if(letterVO.getPageUnit() != 10) {
 			letterVO.setPageUnit(letterVO.getPageUnit());
 		}
-
+		
+		for(int i=0 ; i < cateConfList.size(); i++) {
+			if("선거".equals(cateConfList.get(i).getCateNm())) {
+				letterVO.setCategoryCode(cateConfList.get(i).getCateCode());
+			}
+		}
+		
 		/** pageing */
 		PaginationInfo paginationInfo = new PaginationInfo();
 		paginationInfo.setCurrentPageNo(letterVO.getPageIndex());
@@ -861,6 +867,8 @@ public class MjonMsgCampainDataController {
 		paginationInfo.setTotalRecordCount( resultPhoList.size()> 0 ? ((Long)((EgovMap)resultPhoList.get(0)).get("totCnt")).intValue() : 0);
 		model.addAttribute("paginationInfo", paginationInfo);
 		
+		model.addAttribute("letterVO", letterVO);
+		
 		return "web/msgcampain/excel/MsgExcelDataView";
 	}
 	
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataView.jsp
index d2eb4014..71c5edf0 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataView.jsp
@@ -32,6 +32,13 @@ $(document).ready(function(){
 	//그림문자 샘플 탭 활성화 시키기
 	TabType2($('.tabType2 li').eq(1), '2');
 	
+	$(".tDep2_cateCode a").each(function(index, item){
+		
+		if($(this).text() == "선거"){
+			$('.tDep2_cateCode').find('.on').removeClass('on');
+			$(this).addClass('on');
+		}
+	})
 	// 맞춤제작 요청 JSPark => 2023.02.21 추가
 	//맞춤제작 등록 Popup 
 	//customPopup();	
@@ -83,11 +90,11 @@ function fnLetterListAjax(index){
 		if(document.letterForm.searchKeyword.value == ''){
 			$('.bottom_content .area_total_count').hide();
 		}
-		if(form.hashTag.value != ''){
+		/* if(form.hashTag.value != ''){
 			if($('#letterLoad .nodata_box').length > 0){
 				$('#letterLoad .nodata_box').hide().next('.nodata_box.hashTag').show();
 			}
-		}
+		} */
 	});
 	
 }
@@ -117,7 +124,7 @@ function fnPhotoListAjax(index){
 	form.pageIndex.value = index;
 	var sendData = $(document.letterForm).serializeArray();
 	//하위 카테고리
-	$("#tDep2_depThrCateCode").load("/web/mjon/msgdata/selectCateConfThrDptListAjax.do", sendData ,function(response, status, xhr){
+	$("#tDep2_depThrCateCode").load("/web/mjon/msgcampain/selectCateConfThrDptListAjax.do", sendData ,function(response, status, xhr){
 		if(document.letterForm.searchKeyword.value == ''){
 			$('.bottom_content .area_total_count').hide();
 		}