Merge branch 'rosewiper'

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>
 					

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>