diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs b/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs index 5ba0dafcc..0b012a76e 100644 --- a/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs @@ -339,12 +339,12 @@ public class ImageConsumer( var messageToSend = new MimeMessage(); // 发件地址 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail)); - messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail)); + messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail)); // 添加抄送 foreach (var ccUser in ccUserList) { - messageToSend.Cc.Add(new MailboxAddress(String.Empty, ccUser.EMail)); + messageToSend.Cc.Add(new MailboxAddress(ccUser.FullName, ccUser.EMail)); } // 格式化邮件内容 Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input => @@ -474,12 +474,12 @@ public class ImageConsumer( var messageToSend = new MimeMessage(); // 发件地址 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail)); - messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail)); + messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail)); // 添加抄送 foreach (var ccUser in ccUserList) { - messageToSend.Cc.Add(new MailboxAddress(String.Empty, ccUser.EMail)); + messageToSend.Cc.Add(new MailboxAddress(ccUser.FullName, ccUser.EMail)); } // 格式化邮件内容 diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs b/IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs index 9d63d36a5..c494a2ccc 100644 --- a/IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs @@ -83,7 +83,7 @@ public class UrgentMedicalReviewAddedEventConsumer( var messageToSend = new MimeMessage(); //发件地址 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail)); - messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail)); + messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail)); var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == medicalReview.TrialId); var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN; @@ -192,7 +192,7 @@ public class UrgentIRRepliedMedicalReviewConsumer( var messageToSend = new MimeMessage(); //发件地址 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail)); - messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail)); + messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail)); var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == medicalReview.TrialId); var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN; @@ -308,7 +308,7 @@ public class UrgentMIMRepliedMedicalReviewConsumer( var messageToSend = new MimeMessage(); //发件地址 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail)); - messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail)); + messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail)); var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == medicalReview.TrialId); var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN; @@ -418,7 +418,7 @@ public class UrgentIRApplyedReReadingConsumer( var messageToSend = new MimeMessage(); //发件地址 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail)); - messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail)); + messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail)); var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == taskInfo.TrialId); var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN; diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/SiteSurverEmailConsumer.cs b/IRaCIS.Core.Application/MassTransit/Consumer/SiteSurverEmailConsumer.cs index 302f5aabc..e11306d4d 100644 --- a/IRaCIS.Core.Application/MassTransit/Consumer/SiteSurverEmailConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Consumer/SiteSurverEmailConsumer.cs @@ -2,6 +2,7 @@ using DocumentFormat.OpenXml.Spreadsheet; using DocumentFormat.OpenXml.Vml; using DocumentFormat.OpenXml.Wordprocessing; +using IRaCIS.Application.Contracts; using IRaCIS.Core.Application.Contracts; using IRaCIS.Core.Application.Helper; using IRaCIS.Core.Application.MassTransit.Command; @@ -283,7 +284,7 @@ public class SiteSurverRejectedEventConsumer( { //没有SPM PM驳回到CRC - messageToSend.To.Add(new MailboxAddress(String.Empty, siteSurveyInfo.Email)); + messageToSend.To.Add(new MailboxAddress(siteSurveyInfo.UserName, siteSurveyInfo.Email)); } //发件地址 diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/SubjectVisitQCAndCheckConsumer.cs b/IRaCIS.Core.Application/MassTransit/Consumer/SubjectVisitQCAndCheckConsumer.cs index 52ab6b2d9..af49769e2 100644 --- a/IRaCIS.Core.Application/MassTransit/Consumer/SubjectVisitQCAndCheckConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Consumer/SubjectVisitQCAndCheckConsumer.cs @@ -89,14 +89,14 @@ public class CRCSubmitedAndQCToAuditEventConsumer( foreach (var userinfo in userinfoList) { - messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail)); + messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail)); } var userNames = userinfoList.Select(x => x.FullName).ToList(); foreach (var pm in pmandAPm) { - messageToSend.Cc.Add(new MailboxAddress(String.Empty, pm.EMail)); + messageToSend.Cc.Add(new MailboxAddress(pm.FullName, pm.EMail)); } var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN; @@ -181,11 +181,11 @@ public class CRCRepliedQCChallengeEventConsumer( var messageToSend = new MimeMessage(); //发件地址 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail)); - messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail)); + messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail)); foreach (var pm in pmandAPm) { - messageToSend.Cc.Add(new MailboxAddress(String.Empty, pm.EMail)); + messageToSend.Cc.Add(new MailboxAddress(pm.FullName, pm.EMail)); } var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN; @@ -307,10 +307,10 @@ public class QCRepliedQCChallengeEventConsumer( var messageToSend = new MimeMessage(); //发件地址 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail)); - messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail)); + messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail)); if (craInfo != null) { - messageToSend.Cc.Add(new MailboxAddress(String.Empty, craInfo.EMail)); + messageToSend.Cc.Add(new MailboxAddress(craInfo.FullName, craInfo.EMail)); } var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN; @@ -517,10 +517,10 @@ public class PMRepliedCheckChallengeEventConsumer( var messageToSend = new MimeMessage(); //发件地址 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail)); - messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail)); + messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail)); if (craInfo != null) { - messageToSend.Cc.Add(new MailboxAddress(String.Empty, craInfo.EMail)); + messageToSend.Cc.Add(new MailboxAddress(craInfo.FullName, craInfo.EMail)); } var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN; @@ -620,7 +620,7 @@ public class CheckStateChangedToAuditEventConsumer( var messageToSend = new MimeMessage(); //发件地址 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail)); - messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail)); + messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail)); var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN; @@ -707,11 +707,11 @@ public class QCClaimTaskEventConsumer( var messageToSend = new MimeMessage(); //发件地址 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail)); - messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail)); + messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail)); foreach (var pm in pmandAPm) { - messageToSend.Cc.Add(new MailboxAddress(String.Empty, pm.EMail)); + messageToSend.Cc.Add(new MailboxAddress(pm.FullName, pm.EMail)); } var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN; diff --git a/IRaCIS.Core.Application/MassTransit/Recurring/SystemDocumentConsumer.cs b/IRaCIS.Core.Application/MassTransit/Recurring/SystemDocumentConsumer.cs index 9c89fbdfb..678b63e54 100644 --- a/IRaCIS.Core.Application/MassTransit/Recurring/SystemDocumentConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Recurring/SystemDocumentConsumer.cs @@ -89,7 +89,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring var messageToSend = new MimeMessage(); //发件地址 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail)); - messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail)); + messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail)); @@ -230,7 +230,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring var messageToSend = new MimeMessage(); //发件地址 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail)); - messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail)); + messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail)); diff --git a/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs b/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs index 71dc38aa2..5f4fd1cb6 100644 --- a/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs @@ -113,7 +113,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring var messageToSend = new MimeMessage(); //发件地址 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail)); - messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail)); + messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail)); @@ -265,7 +265,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring var messageToSend = new MimeMessage(); //发件地址 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail)); - messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail)); + messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));