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());