修改bug#40894

jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java

@@ -236,6 +236,14 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
                 if(!CollectionUtils.isEmpty(listSysUser)){
                     p.setRealName(listSysUser.get(0).getRealname());
                 }
+                if(!StringUtils.isEmpty(p.getMailer())){
+                    LambdaQueryWrapper<SysUser> querySysUserNew = new LambdaQueryWrapper<>();
+                    querySysUserNew.eq(SysUser::getUsername,p.getMailer());
+                    List<SysUser> listSysUserNew = sysUserService.list(querySysUserNew);
+                    if(!CollectionUtils.isEmpty(listSysUserNew)){
+                        p.setMailName(listSysUserNew.get(0).getRealname());
+                    }
+                }
             });
             projectDetailVO.setMailBill(listPayMailBillVO);
         }

jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java

@@ -150,10 +150,16 @@ public class PayMailBill implements Serializable {
     @ApiModelProperty(value = "通讯地址")
     @NotNull(message = "通讯地址")
     private java.lang.String contactAddress;
+    /**
+     * 开票人（真是姓名）
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "开票人（真是姓名）")
+    private String realName;
     /**
      * 邮寄人（真是姓名）
      */
     @TableField(exist = false)
     @ApiModelProperty(value = "邮寄人（真是姓名）")
-    private String realName;
+    private String mailName;
 }

jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java

@@ -482,12 +482,22 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 				 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());
 				 }
+
+				 if(!StringUtils.isEmpty(p.getMailer())){
+					 LambdaQueryWrapper<SysUser> querySysUserNew = new LambdaQueryWrapper<>();
+					 querySysUserNew.eq(SysUser::getUsername,p.getMailer());
+					 List<SysUser> listSysUserNew = sysUserService.list(querySysUserNew);
+					 if(!CollectionUtils.isEmpty(listSysUserNew)){
+						 p.setMailName(listSysUserNew.get(0).getRealname());
+					 }
+				 }
 			 });
 			 payCompanyCommonProject.setMailBill(listPayMailBillVO);
 		 }