From 824ccedbb2dc5c43ed8cd2035fa3ef76b43ab879 Mon Sep 17 00:00:00 2001
From: mx <1289317512@qq.com>
Date: Wed, 9 Oct 2024 17:42:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/report.ftl                                             | 4 +++-
 .../service/approver/impl/SignApproverServiceImpl.java     | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

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>
                         <div style="height: 5pt;width: 1pt"></div>
                         <p class="content" style="text-indent:5pt">
-                            ${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<PsCompanyInfoBo> serviceCompanyInfoList = new ArrayList<>();
         bo.setServiceCompanyInfoList(serviceCompanyInfoList);