From 4e2f4b87a1ae39a3d1931fec097ad96621bb9a4b Mon Sep 17 00:00:00 2001
From: woo <woo@DESKTOP-5FPS6Q0>
Date: Mon, 3 Jul 2023 17:09:23 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=9A=8C?=
 =?UTF-8?q?=EC=9B=90=EC=A0=95=EB=B3=B4=20=ED=8C=9D=EC=97=85=20>=20?=
 =?UTF-8?q?=EC=B5=9C=EA=B7=BC=EB=AC=B8=EC=9E=90=EC=A0=84=EC=86=A1=20?=
 =?UTF-8?q?=EB=82=B4=EC=97=AD=EC=9D=98=20=EC=98=88=EC=95=BD=EB=AC=B8?=
 =?UTF-8?q?=EC=9E=90=20=EB=8D=94=EB=B3=B4=EA=B8=B0=20=ED=8C=9D=EC=97=85?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=98=88=EC=95=BD=EB=AC=B8=EC=9E=90?=
 =?UTF-8?q?=EC=97=90=20=EB=8C=80=ED=95=9C=20=EB=94=9C=EB=A0=88=EC=9D=B4=20?=
 =?UTF-8?q?=EB=AC=B8=EC=9E=90=EB=82=B4=EC=97=AD=20=ED=91=9C=EC=8B=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=20-=20=EB=94=9C=EB=A0=88=EC=9D=B4?=
 =?UTF-8?q?=EA=B1=B4=EC=9D=B4=20=EC=95=84=EB=8B=88=EA=B1=B0=EB=82=98=20?=
 =?UTF-8?q?=EB=94=9C=EB=A0=88=EC=9D=B4=EA=B1=B4=EC=9D=B4=EC=A7=80=EB=A7=8C?=
 =?UTF-8?q?=20=EC=B2=98=EB=A6=AC=EC=99=84=EB=A3=8C=20=EA=B1=B4=EC=97=90=20?=
 =?UTF-8?q?=EB=8C=80=ED=95=9C=20=EC=98=88=EC=95=BD=EB=AC=B8=EC=9E=90=20?=
 =?UTF-8?q?=EB=82=B4=EC=97=AD=EB=A7=8C=20=EB=B3=B4=EC=9D=B4=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=B2=98=EB=A6=AC=20=20-=20DELAY=5FYN=3D'N'=20AND?=
 =?UTF-8?q?=20DELAY=5FCOMPLETE=5FYN=3D'N'=20OR=20DELAY=5FYN=3D'Y'=20AND=20?=
 =?UTF-8?q?DELAY=5FCOMPLETE=5FYN=3D'Y'=20=EC=9D=B8=20=EC=A1=B0=EA=B1=B4=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmap/let/msg/MjonMsgData_SQL_mysql.xml        | 13 +++++++++++++
 .../jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp      |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
index 197a840a..60cef67d 100644
--- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
@@ -4659,6 +4659,19 @@
 						AND MGD.REQ_DATE > now()
 						AND MGD.RESERVE_YN = 'Y'
 						]]>
+						/**30분 지연이 아니거나 지연 처리가 완료된 건들 불러오기*/
+		                 AND
+	                         (
+	                                 (
+	                                         MGD.DELAY_YN          = 'N'
+	                                 AND     MGD.DELAY_COMPLETE_YN = 'N'
+	                                 )
+	                         OR
+	                                 (
+	                                         MGD.DELAY_YN          = 'Y'
+	                                 AND     MGD.DELAY_COMPLETE_YN = 'Y'
+	                                 )
+	                         )
 						</isEqual>
 					</isNotEmpty>
 					
diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
index 7448d5b1..29b53d00 100644
--- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
+++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
@@ -3516,7 +3516,7 @@ function fnMberExceptSpamYn(){
 								</thead>
 								<tbody>
 									<c:choose>
-										<c:when test="${not empty mjonMsgSentList}">
+										<c:when test="${not empty mjonMsgSentList2}">
 											<c:forEach var="mjonMsgSentList" items="${mjonMsgSentList2}" varStatus="status">
 												<tr>
 													<td><c:out value="${status.count}"/></td>
@@ -3664,7 +3664,7 @@ function fnMberExceptSpamYn(){
 										</c:when>
 										<c:otherwise>
 											<tr>
-												<td colspan="9">문자 발송 내역이 없습니다.</td>
+												<td colspan="9">예약 문자 내역이 없습니다.</td>
 											</tr>
 										</c:otherwise>
 									</c:choose>
@@ -3868,7 +3868,7 @@ function fnMberExceptSpamYn(){
 									</c:when>
 									<c:otherwise>
 										<tr>
-											<td colspan="9">문자 발송 내역이 없습니다.</td>
+											<td colspan="9">문자 지연 내역이 없습니다.</td>
 										</tr>
 									</c:otherwise>
 								</c:choose>