diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java index 0ee7572..51729ff 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java @@ -551,8 +551,11 @@ public class ProjectLibManage { List payments = paymentPlanService.list(Wrappers.lambdaQuery(PaymentPlan.class) .in(PaymentPlan::getProjectId, allVersionProjectId) .orderByAsc(PaymentPlan::getPaymentTime)); - contractVO.setPayments(convertPayments(payments, - Objects.nonNull(contractVO) ? contractVO.getTotalAmount(): BigDecimal.ZERO)); + if(Objects.nonNull(contractVO)){ + contractVO.setPayments(convertPayments(payments, + contractVO.getTotalAmount())); + } + //查询初验信息 List acceptancePersons = acceptancePersonService.list(Wrappers.lambdaQuery(PreInsAcceptancePerson.class)