diff --git a/doc/report.ftl b/doc/report.ftl index 666f047..37bc386 100644 --- a/doc/report.ftl +++ b/doc/report.ftl @@ -92,7 +92,9 @@ <#list company.businessList as item>
- ${item.businessTypeName}-金额:${item.businessAmount}元
+ <#if item.businessAmount??>
+ ${item.businessTypeName}-金额:${item.businessAmount}元
+ #if>
<#if item.businessDesc?? && item.businessDesc != "">
-备注:${item.businessDesc}
#if>
diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/SignApproverServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/SignApproverServiceImpl.java
index bbf9613..b05e206 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/SignApproverServiceImpl.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/SignApproverServiceImpl.java
@@ -57,7 +57,14 @@ public class SignApproverServiceImpl extends ApproverAbstractServiceImpl {
PsContractInfo info = new PsContractInfo();
BeanUtils.copyProperties(vo, info);
PsCompanyInfoBo companyInfo = new PsCompanyInfoBo();
+ if (vo.getPsCompanyInfoVo() == null){
+ PsCompanyInfoVo psCompanyInfoVo = new PsCompanyInfoVo();
+ psCompanyInfoVo.setLegalPersonName(vo.getContactPersonName());
+ psCompanyInfoVo.setLegalPersonPhone(vo.getContactPersonPhone());
+ vo.setPsCompanyInfoVo(psCompanyInfoVo);
+ }
BeanUtils.copyProperties(vo.getPsCompanyInfoVo(), companyInfo);
+
bo.setCompanyInfoBo(companyInfo);
List