From 3a9d5a4be271073f27121e40ab6e79d28756b113 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 3 Nov 2021 17:01:42 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=2041993=20=E7=BC=B4=E8=B4=B9=E5=87=AD?=
 =?UTF-8?q?=E8=AF=81=E6=9C=AA=E5=AE=A1=E6=A0=B8=E6=97=B6=E5=8E=BB=E5=BC=80?=
 =?UTF-8?q?=E7=A5=A8=EF=BC=8C=E5=BC=80=E5=AE=8C=E7=A5=A8=EF=BC=8C=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=87=AD=E8=AF=81=E6=8C=89=E9=92=AE=E7=9C=8B=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/mail/service/impl/PayMailBillServiceImpl.java   | 5 +++++
 .../java/com/jero/meeting/entity/PayMeetingSituation.java    | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
index 50aa8950..4d906cc3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
@@ -800,13 +800,18 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
 
                 //查父表
                 TbMemberProject tbProject = tbMemberProjectMapper.selectById(tbMemberProject.getProjectId());
+                SysUser queryTbMemberProjectSysUser = sysUserService.getById(tbProject.getDirectorId());
                 //逗号拼接邮寄信息
                 if(i==0){
                     projectName.append(tbProject.getProjectName());
                     chargeCompanyName.append(tbMemberProject.getCompanyName());
+                    principalName.append(queryTbMemberProjectSysUser.getRealname());
+                    principalId.append(tbProject.getDirectorId());
                 }else{
                     projectName.append(",").append(tbProject.getProjectName());
                     chargeCompanyName.append(",").append(tbMemberProject.getCompanyName());
+                    principalName.append(",").append(queryTbMemberProjectSysUser.getRealname());
+                    principalId.append(",").append(tbProject.getDirectorId());
                 }
                 break;
             default:
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
index 4b1e849d..ffe9f7f2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
@@ -297,7 +297,6 @@ public class PayMeetingSituation implements Serializable {
 
 	/**付款凭证*/
     @ApiModelProperty(value = "付款凭证")
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String paymentRecord;
 
     /**订单后4位编码*/