From 53747d5c7e19102b3b67e93b4c0a4fd6e49f5725 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Thu, 19 Oct 2023 19:06:49 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EC=9E=AC=EC=A0=84?=
 =?UTF-8?q?=EC=86=A1=20=EC=BF=BC=EB=A6=AC=20=EC=84=B1=EB=8A=A5=EA=B0=9C?=
 =?UTF-8?q?=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml              | 8 ++++++++
 .../webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp  | 2 --
 .../webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp     | 2 --
 .../webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp | 2 --
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
index 4e96203a..fdb7027c 100644
--- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
@@ -319,6 +319,14 @@
 				<![CDATA[ 
 					AND B.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)
 				]]>
+				<isNotEmpty property="msgSentType">
+					<isEqual property="msgSentType" compareValue="01" >
+						AND B.MSG_KIND != 'C'
+					</isEqual>
+					<isEqual property="msgSentType" compareValue="02" >
+						AND B.MSG_KIND = 'C'
+					</isEqual>
+				</isNotEmpty>				
 			)M
 			LEFT JOIN
 			(
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
index 4b192c5a..14462670 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
@@ -4078,11 +4078,9 @@ function getMjMsgSentListAll(pageNo) {
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup03" class="btnType btnType7 tab2">자주 보내는 번호</button>
 											</div>
-											<%-- 
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1');">재전송</button>
 											</div>
-											--%>
 											<div class="btn_popup_wrap check_validity_wrap">
 												<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button>
 												<div class="error_hover_cont send_hover_cont">
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
index 367d5f93..c17ad928 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
@@ -3878,11 +3878,9 @@ function getMjMsgSentListAll(pageNo) {
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup03" class="btnType btnType7 tab2">자주 보내는 번호</button>
 											</div>
-											<%--
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1');">재전송</button>
 											</div>
-											--%>
 											<div class="btn_popup_wrap check_validity_wrap">
 												<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button>
 												<div class="error_hover_cont send_hover_cont">
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
index 0ca3df70..02541146 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
@@ -207,9 +207,7 @@ $(document).ready(function(){
 							</td>
 							<td name="listTd">
 								<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button>
-								<%-- 
 								<button class="btnType btnType20" onClick="javascript:fnMjMsgReSendAll('${resultAllSentList.msgGroupId}','${replaceCnt}','${electionCnt}','${advertisementCnt}'); return false;">재전송</button>
-								--%>								
 							</td>
 							<td name="listTd">
 								<c:choose>