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

---
 .../common/service/impl/ProjectDetailServiceImpl.java  | 10 ++++++++++
 .../main/java/com/jero/mail/entity/PayMailBill.java    |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
index 7f9ba235..93931340 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
@@ -25,6 +25,8 @@ import com.jero.mail.entity.PayMailBill;
 import com.jero.mail.entity.PayMailBillProject;
 import com.jero.mail.service.IPayMailBillProjectService;
 import com.jero.mail.service.IPayMailBillService;
+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;
@@ -71,6 +73,8 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
     private IPayMailBillProjectService payMailBillProjectService;
     @Resource
     private IPayWorkingGroupDistributionRecordService payWorkingGroupDistributionRecordService;
+    @Resource
+    private ISysUserService sysUserService;
 
     @Override
     public ProjectDetailVO getProjectDetail(String projectId) {
@@ -226,6 +230,12 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
                 if(!Objects.isNull(p.getSendMethod())){
                     p.setSendMethod_dictText(sysBaseAPI.translateDict("mail_send",String.valueOf(p.getSendMethod())));
                 }
+                LambdaQueryWrapper<SysUser> querySysUser = new LambdaQueryWrapper<>();
+                querySysUser.eq(SysUser::getUsername,p.getCreateBy());
+                List<SysUser> listSysUser = sysUserService.list(querySysUser);
+                if(!CollectionUtils.isEmpty(listSysUser)){
+                    p.setRealName(listSysUser.get(0).getRealname());
+                }
             });
             projectDetailVO.setMailBill(listPayMailBillVO);
         }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java
index 550e2325..efe9e977 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java
@@ -150,4 +150,10 @@ public class PayMailBill implements Serializable {
     @ApiModelProperty(value = "通讯地址")
     @NotNull(message = "通讯地址")
     private java.lang.String contactAddress;
+    /**
+     * 邮寄人（真是姓名）
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "邮寄人（真是姓名）")
+    private String realName;
 }