From da559bb35dee3e71f394f47a90ecd3eee6ea0f82 Mon Sep 17 00:00:00 2001
From: wyh <Administrator@DESKTOP-NTG19QC>
Date: Tue, 11 Jul 2023 12:02:52 +0900
Subject: [PATCH] =?UTF-8?q?=EC=95=8C=EB=A6=BC=ED=86=A1=20=EC=A0=84?=
 =?UTF-8?q?=EC=86=A1=EB=82=B4=EC=97=AD=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/uss/umt/web/EgovUserManageController.java    |  2 ++
 .../sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml   | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
index a5298ce5..155c5ff8 100644
--- a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
+++ b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
@@ -1377,6 +1377,7 @@ public class EgovUserManageController {
 			sendKakaoVO.setSearchSortCnd("reqDate");
 			sendKakaoVO.setSearchSortOrd("desc");
 			sendKakaoVO.setFirstIndex(0);
+			sendKakaoVO.setPageType("sand");
 			List<KakaoVO> kakaoResultList = new ArrayList<KakaoVO>();
 			kakaoResultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList(sendKakaoVO);
 			
@@ -1395,6 +1396,7 @@ public class EgovUserManageController {
 			reserveKakaoVO.setSearchSortCnd("reqDate");
 			reserveKakaoVO.setSearchSortOrd("desc");
 			reserveKakaoVO.setFirstIndex(0);
+			reserveKakaoVO.setPageType("sand");
 			List<KakaoVO> kakaoReserveList = new ArrayList<KakaoVO>();
 			kakaoReserveList = mjonKakaoATService.selectReserveMjonKakaoATGroupList(reserveKakaoVO);
 			
diff --git a/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml
index a6a0e055..296aee94 100644
--- a/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml
@@ -602,6 +602,11 @@
 				</isNotEmpty>
 			</isEmpty>
 			
+			<isNotEmpty property="pageType">
+				<isEqual property="pageType" compareValue="sand">
+					AND M.CUR_STATE = '3'
+				</isEqual>
+			</isNotEmpty>
 			
 			<isNotEmpty property="msgType">
 				<isEqual property="msgType" compareValue="8">
@@ -1241,6 +1246,7 @@
 					, MD.BIZ_KAKAO_RESEND_YN
 					, MG.AT_DELAY_COMPLETE_YN
 					, MG.AT_DELAY_YN
+					, MD.REFUND_YN
 				FROM    MJ_MSG_DATA MD ,
 						MJ_MSG_GROUP_DATA MG
 				WHERE	MD.MSG_GROUP_ID = MG.MSG_GROUP_ID
@@ -1323,6 +1329,12 @@
 					</isNotEmpty>
 				</isEmpty>
 				
+				<isNotEmpty property="pageType">
+					<isEqual property="pageType" compareValue="sand">
+						AND M.AT_DELAY_COMPLETE_YN ='Y'
+						AND M.REFUND_YN = 'N'
+					</isEqual>
+				</isNotEmpty>
 				
 				<isNotEmpty property="msgType">
 					<isEqual property="msgType" compareValue="8">