From c668d909c6ea07c38162edcc6d34ecf0f0624862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Sun, 26 Sep 2021 18:23:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contract/controller/PaySpendingContractController.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
index b7d73183..22f57af4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
@@ -291,9 +291,9 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 						listSub.forEach(p1->{
 							int n = listSub.indexOf(p1) + 1;
 							map.put("phaseName" + n,p1.getPhaseName());
-							map.put("accountsReceivableAmount" + n,String.valueOf(p1.getAccountsReceivableAmount()));
+							map.put("accountsReceivableAmount" + n,Objects.isNull(p1.getAccountsReceivableAmount()) ? "" : String.valueOf(p1.getAccountsReceivableAmount()));
 							map.put("accountsReceivableTime" + n, DateUtils.date2Str(p1.getAccountsReceivableTime(),new SimpleDateFormat("yyyy-MM-dd")));
-							map.put("paidAmount" + n,String.valueOf(p1.getPaidAmount()));
+							map.put("paidAmount" + n,Objects.isNull(p1.getPaidAmount()) ? "" : String.valueOf(p1.getPaidAmount()));
 							map.put("paidTime" + n,DateUtils.date2Str(p1.getPaidTime(),new SimpleDateFormat("yyyy-MM-dd")));
 						});
 					}
@@ -340,7 +340,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
 		mv.addObject(MapExcelConstants.FILE_NAME, "收入合同"); //此处设置的filename无效 ,前端会重更新设置一下
 		mv.addObject(MapExcelConstants.ENTITY_LIST, filedsList);
 		//update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
-		ExportParams exportParams=new ExportParams("收入合同", "收入合同");
+		ExportParams exportParams=new ExportParams("支出合同", "支出合同");
 		exportParams.setImageBasePath(env.getProperty("jero.path.upload"));
 		//update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
 		mv.addObject(MapExcelConstants.PARAMS,exportParams);