Update AccountController.java

roncoo · Sep 19, 2016 · fa37ee0 · fa37ee0
1 parent abe2ac7
commit fa37ee0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...o-pay-web-merchant/src/main/java/com/roncoo/pay/controller/account/AccountController.java b/...o-pay-web-merchant/src/main/java/com/roncoo/pay/controller/account/AccountController.java
@@ -79,7 +79,10 @@ public String getAccountInfo(HttpServletRequest request) {
 		String userNo = rpUserInfo.getUserNo();
 		RpAccount rpAccount = rpAccountService.getDataByUserNo(userNo);
 		RpUserPayConfig rpUserPayConfig = rpUserPayConfigService.getByUserNo(userNo);
-		List<RpPayWay> rpPayWayList = rpPayWayService.listByProductCode(rpUserPayConfig.getProductCode());
+		List<RpPayWay> rpPayWayList = new ArrayList<RpPayWay>(); 
+		if(rpUserPayConfig != null){
+			rpPayWayList = rpPayWayService.listByProductCode(rpUserPayConfig.getProductCode());
+		}
 
 
 		request.setAttribute("rpAccount", rpAccount);