Merge branch 'master' into campain

src/main/webapp/WEB-INF/jsp/web/pay/PayUserList.jsp

@@ -208,11 +208,19 @@ function fnRevDetailPop03(msgGroupId){
 					<p>
 						<i></i>충전금액
 					</p>
+					
 					<div class="clearfix">
 						<p>캐시</p>
 						<p>
 							<span>
-								<fmt:formatNumber value="${sumPayMoney}" pattern="" />
+								<c:choose>
+									<c:when test="${not empty sumPayMoney}">
+										<fmt:formatNumber value="${sumPayMoney}" pattern="" />
+									</c:when>
+									<c:otherwise>
+										<fmt:formatNumber value="0" pattern="" />
+									</c:otherwise>
+								</c:choose>
 							</span>원
 						</p>
 					</div>
@@ -220,7 +228,14 @@ function fnRevDetailPop03(msgGroupId){
 						<p>포인트</p>
 						<p>
 							<span>
-								<fmt:formatNumber value="${sumPoint}" pattern="" />
+								<c:choose>
+									<c:when test="${not empty sumPoint}">
+										<fmt:formatNumber value="${sumPoint}" pattern="" />
+									</c:when>
+									<c:otherwise>
+										<fmt:formatNumber value="0" pattern="" />
+									</c:otherwise>
+								</c:choose>
 							</span>원
 						</p>
 					</div>