XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Uat_Study
he 2023-02-14 10:09:09 +08:00
parent 8f4b47aad6
commit ea79b01d4c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs
View File

@ -132,7 +132,7 @@ namespace IRaCIS.Core.Application.ViewModel
public string FromEmail { get; set; } = string.Empty;
public List<UserTypeEnum> ToUserTypeList { get; set; }
public List<UserTypeEnum>? ToUserTypeList { get; set; }
public List<UserTypeEnum> CopyUserTypeList { get; set; }

8
IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
View File

@ -71,8 +71,8 @@ namespace IRaCIS.Core.Application.Service
{
await TestEmailConfigAsync(new TrialEmailNoticeConfigAddOrEdit() {
AuthorizationCode=inDto.EmailAuthorizationCode,
AuthorizationCode=inDto.EmailAuthorizationCode,
FromEmail=inDto.EmailFromEmail,
FileName=inDto.EmailFromName,
SMTPServerAddress=inDto.EmailSMTPServerAddress,
@ -913,7 +913,9 @@ namespace IRaCIS.Core.Application.Service
private async Task TestEmailConfigAsync(TrialEmailNoticeConfigAddOrEdit config)
{
var toUserList = await _repository.Where<TrialUser>(t => t.TrialId == config.TrialId && config.ToUserTypeList.Contains(t.User.UserTypeEnum)).Select(t => new { t.User.EMail, t.User.FullName }).ToListAsync();
var toUserList = await _repository.Where<TrialUser>(t => t.TrialId == config.TrialId)
.WhereIf(config.ToUserTypeList != null, t => config.ToUserTypeList.Contains(t.User.UserTypeEnum))
.Select(t => new { t.User.EMail, t.User.FullName }).ToListAsync();
if (!config.FromEmail.Contains("@") || string.IsNullOrEmpty(config.FromEmail))