From 81ecb26487ffc8a61250a50cb06efe220d015d68 Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Tue, 2 Jan 2024 16:52:45 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9A=94=EA=B8=88=EB=82=B4?=
 =?UTF-8?q?=EC=97=AD=20=EA=B1=B0=EB=9E=98=EB=AA=85=EC=84=B8=EC=84=9C=20?=
 =?UTF-8?q?=EB=B0=8F=20=EC=82=AC=EC=9A=A9=EB=82=B4=EC=97=AD=EC=84=9C=20?=
 =?UTF-8?q?=ED=8C=9D=EC=97=85=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=20-=20=EB=B0=9C=EC=86=A1=20=EB=82=B4=EC=97=AD=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EC=84=B1=EA=B3=B5=20=EB=82=B4=EC=97=AD=EC=9D=B4=20?=
 =?UTF-8?q?=ED=95=98=EB=82=98=EB=8F=84=20=EC=97=86=EB=8A=94=20=EA=B2=BD?=
 =?UTF-8?q?=EC=9A=B0=20=ED=8C=9D=EC=97=85=20=EC=98=A4=EB=A5=98=20=EB=B0=9C?=
 =?UTF-8?q?=EC=83=9D=ED=95=98=EC=97=AC=20=EC=98=88=EC=99=B8=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itn/let/mjo/pay/web/MjonPayController.java  | 17 +++++++++++++----
 .../jsp/web/pay/MsgPrintStatementPopUp.jsp      |  2 +-
 .../jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp   |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java
index 99232112..03676157 100644
--- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java
+++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java
@@ -4787,7 +4787,10 @@ public class MjonPayController {
 		if(!"".equals(startDate)) {
 			startDate = startDate.replaceAll("/", "-");
     	}else {
-    		startDate = transFormat.format(minRegDate);
+    		
+    		if(minRegDate != null) {
+    			startDate = transFormat.format(minRegDate);
+    		}
     	}
     	model.addAttribute("startDate", startDate);
     	
@@ -4795,7 +4798,9 @@ public class MjonPayController {
     	if(!"".equals(endDate)) {
     		endDate = endDate.replaceAll("/", "-");
     	}else {
-    		endDate = transFormat.format(maxRegDate);
+    		if(maxRegDate != null) {
+    			endDate = transFormat.format(maxRegDate);
+    		}
     	}
     	model.addAttribute("endDate", endDate);
     	
@@ -5023,7 +5028,9 @@ public class MjonPayController {
     	if(!"".equals(startDate)) {
 			startDate = startDate.replaceAll("/", "-");
     	}else {
-    		startDate = transFormat.format(minRegDate);
+    		if(minRegDate != null) {
+    			startDate = transFormat.format(minRegDate);
+    		}
     	}
     	model.addAttribute("startDate", startDate);
     	
@@ -5031,7 +5038,9 @@ public class MjonPayController {
     	if(!"".equals(endDate)) {
     		endDate = endDate.replaceAll("/", "-");
     	}else {
-    		endDate = transFormat.format(maxRegDate);
+    		if(maxRegDate != null) {
+    			endDate = transFormat.format(maxRegDate);
+    		}
     	}
     	model.addAttribute("endDate", endDate);
     	
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp
index 168bd867..ac45b2d0 100644
--- a/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp
@@ -194,7 +194,7 @@ function f_print(){
 								<c:otherwise>
 									<tr>
 										<td colspan="5">
-											<spring:message code="common.nodata.msg" />
+											거래내역이 없습니다.
 										</td>
 									</tr>
 								</c:otherwise>
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp
index e6e00c3d..881e7c10 100644
--- a/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp
@@ -165,7 +165,7 @@ function f_print(){
 								<c:otherwise>
 									<tr>
 										<td colspan="5">
-											<spring:message code="common.nodata.msg" />
+											사용내역이 없습니다.
 										</td>
 									</tr>
 								</c:otherwise>