From ea79b01d4c6517016004b8767c49db200233e82b Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 14 Feb 2023 10:09:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Document/DTO/TrialEmailNoticeConfigViewModel.cs | 2 +- .../Service/Document/TrialEmailNoticeConfigService.cs | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs b/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs index cc3f110d..97b2810c 100644 --- a/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs +++ b/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs @@ -132,7 +132,7 @@ namespace IRaCIS.Core.Application.ViewModel public string FromEmail { get; set; } = string.Empty; - public List ToUserTypeList { get; set; } + public List? ToUserTypeList { get; set; } public List CopyUserTypeList { get; set; } diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs index 3d03f74e..6292dae0 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs @@ -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(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(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))