生效通知改为单独发
This commit is contained in:
@@ -119,7 +119,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
|
||||
|
||||
var htmlBodyStr = string.Format(
|
||||
CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
|
||||
userinfo.UserName,
|
||||
userinfo.FullName,
|
||||
_systemEmailConfig.SiteUrl
|
||||
);
|
||||
|
||||
@@ -237,29 +237,18 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
|
||||
return;
|
||||
}
|
||||
|
||||
var userWorkLanguageList = userinfoList.Select(x => x.UserWorkLanguage).Distinct().ToList();
|
||||
foreach (var workLanguage in userWorkLanguageList)
|
||||
foreach (var userinfo in userinfoList)
|
||||
{
|
||||
var langUserInfoList = userinfoList.Where(x => x.UserWorkLanguage == workLanguage).ToList();
|
||||
if (!langUserInfoList.Any())
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
string msg = $"{langUserInfoList.Count}生效通知,";
|
||||
string msg = $"{userinfo.UserName}生效通知,";
|
||||
try
|
||||
{
|
||||
var messageToSend = new MimeMessage();
|
||||
messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
|
||||
messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
|
||||
|
||||
foreach (var userinfo in langUserInfoList)
|
||||
{
|
||||
messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
|
||||
}
|
||||
|
||||
var workLanguage = userinfo.UserWorkLanguage;
|
||||
var userIsEn_US = workLanguage == UserWorkLanguage.US;
|
||||
var companyName = userIsEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
|
||||
var userNames = langUserInfoList.Select(x => x.UserName).ToList();
|
||||
|
||||
Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
|
||||
{
|
||||
@@ -267,7 +256,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
|
||||
|
||||
var htmlBodyStr = string.Format(
|
||||
CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
|
||||
string.Join(',', userNames),
|
||||
userinfo.FullName,
|
||||
_systemEmailConfig.SiteUrl
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user