From 8e3f0f8de5a83b40d894b69299cff5d3579e77fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Thu, 28 Oct 2021 11:44:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#41540?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMailBillServiceImpl.java  | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

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 4a540232..f7f5088b 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
@@ -41,6 +41,8 @@ import com.jero.member.mapper.PayMemberProjectMapper;
 import com.jero.member.mapper.PayMemberProjectSubitemMapper;
 import com.jero.member.mapper.TbMemberProjectMapper;
 import com.jero.member.mapper.TbMemberProjectSubitemMapper;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.service.ISysUserService;
 import com.jero.payment.entity.PayPaymentRecord;
 import com.jero.payment.service.IPayPaymentRecordService;
 import com.jero.project.entity.PayCommonProject;
@@ -109,6 +111,8 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
     private IPayCompanyManagementService payCompanyManagementService;
     @Resource
     private IPayPaymentRecordService payPaymentRecordService;
+    @Resource
+    private ISysUserService sysUserService;
 
 
     @Override
@@ -545,16 +549,23 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
 
                 //查父表
                 PayMeeting payMeeting = payMeetingMapper.selectById(meeting.getMeetingId());
+                LambdaQueryWrapper<SysUser> queryPayMeetingSysUser = new LambdaQueryWrapper<>();
+                queryPayMeetingSysUser.eq(SysUser::getId,payMeeting.getDirectorId());
+                List<SysUser> sysPayMeetingUser = sysUserService.list(queryPayMeetingSysUser);
                 //逗号拼接邮寄信息
                 if(i==0){
                     projectName.append(payMeeting.getMeetingName());
                     chargeCompanyName.append(meeting.getCompanyName());
-                    principalName.append(payMeeting.getDirectorName());
+                    if(!CollectionUtils.isEmpty(sysPayMeetingUser)) {
+                        principalName.append(sysPayMeetingUser.get(0).getRealname());
+                    }
                     principalId.append(payMeeting.getDirectorId());
                 }else{
                     projectName.append(",").append(payMeeting.getMeetingName());
                     chargeCompanyName.append(",").append(meeting.getCompanyName());
-                    principalName.append(",").append(payMeeting.getDirectorName());
+                    if(!CollectionUtils.isEmpty(sysPayMeetingUser)) {
+                        principalName.append(",").append(sysPayMeetingUser.get(0).getRealname());
+                    }
                     principalId.append(",").append(payMeeting.getDirectorId());
                 }
                 break;
@@ -572,16 +583,23 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
 
                 //查父表
                 PayMemberProject payMemberProject = payMemberProjectMapper.selectById(memberProject.getProjectId());
+                LambdaQueryWrapper<SysUser> queryPayMemberProjectSysUser = new LambdaQueryWrapper<>();
+                queryPayMemberProjectSysUser.eq(SysUser::getId,payMemberProject.getDirectorId());
+                List<SysUser> sysPayMemberProjectUser = sysUserService.list(queryPayMemberProjectSysUser);
                 //逗号拼接邮寄信息
                 if(i==0){
                     projectName.append(payMemberProject.getProjectName());
                     chargeCompanyName.append(memberProject.getCompanyName());
-                    principalName.append(payMemberProject.getDirectorName());
+                    if(!CollectionUtils.isEmpty(sysPayMemberProjectUser)) {
+                        principalName.append(sysPayMemberProjectUser.get(0).getRealname());
+                    }
                     principalId.append(payMemberProject.getDirectorId());
                 }else{
                     projectName.append(",").append(payMemberProject.getProjectName());
                     chargeCompanyName.append(",").append(memberProject.getCompanyName());
-                    principalName.append(",").append(payMemberProject.getDirectorName());
+                    if(!CollectionUtils.isEmpty(sysPayMemberProjectUser)) {
+                        principalName.append(",").append(sysPayMemberProjectUser.get(0).getRealname());
+                    }
                     principalId.append(",").append(payMemberProject.getDirectorId());
                 }
                 break;