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 kakaoResultList = new ArrayList(); kakaoResultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList(sendKakaoVO); @@ -1395,6 +1396,7 @@ public class EgovUserManageController { reserveKakaoVO.setSearchSortCnd("reqDate"); reserveKakaoVO.setSearchSortOrd("desc"); reserveKakaoVO.setFirstIndex(0); + reserveKakaoVO.setPageType("sand"); List kakaoReserveList = new ArrayList(); 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 @@ + + + AND M.CUR_STATE = '3' + + @@ -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 @@ + + + AND M.AT_DELAY_COMPLETE_YN ='Y' + AND M.REFUND_YN = 'N' + +