From b10a15159db6c6f25ec8c441d2379bc112b311a5 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Tue, 14 Nov 2023 10:28:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E8=88=B1=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=95=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java
index 072a717..2536dcb 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java
@@ -417,8 +417,8 @@ public class ProjectConvert {
         req.setBaseProjSetYear(apply.getBaseProjSetYear());
         req.setBaseProjSys(apply.getBaseProjSys());
         req.setBaseProjSysCode(apply.getBaseProjSysCode());
-        req.setBaseProjDeclAmount(String.valueOf(apply.getBaseProjDeclAmount()));
-        req.setBaseProjTotalAmount(String.valueOf(apply.getBaseProjTotalAmount()));
+        req.setBaseProjDeclAmount(Objects.nonNull(apply.getBaseProjDeclAmount()) ? String.valueOf(apply.getBaseProjDeclAmount()) : null);
+        req.setBaseProjTotalAmount(Objects.nonNull(apply.getBaseProjTotalAmount()) ? String.valueOf(apply.getBaseProjTotalAmount()) : null);
         req.setBaseBasisAmountOri(apply.getBaseBasisAmountOri());
         req.setBaseProjAmountOri(apply.getBaseProjAmountOri());
         req.setBaseProjRemark(apply.getBaseProjRemark());