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 queryPayMeetingSysUser = new LambdaQueryWrapper<>(); + queryPayMeetingSysUser.eq(SysUser::getId,payMeeting.getDirectorId()); + List 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 queryPayMemberProjectSysUser = new LambdaQueryWrapper<>(); + queryPayMemberProjectSysUser.eq(SysUser::getId,payMemberProject.getDirectorId()); + List 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;