From 95042fe6ba4acf27e718ca3692007bfce6d5278b Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 30 Oct 2024 09:44:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E9=82=AE?= =?UTF-8?q?=E4=BB=B6=E8=BF=99=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Common/DTO/EmailNoticeConfigViewModel.cs | 1 + .../Service/Document/TrialEmailNoticeConfigService.cs | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs index 2f0304535..47cdbdd6d 100644 --- a/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs +++ b/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs @@ -62,6 +62,7 @@ namespace IRaCIS.Core.Application.Contracts public bool? IsDistinguishCriteria { get; set; } public SysEmailLevel? SystemLevel { get; set; } + public int? BusinessModuleEnum { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs index 4327d722f..e141deabc 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs @@ -1249,6 +1249,7 @@ namespace IRaCIS.Core.Application.Service .WhereIf(inQuery.IsReturnRequired != null, t => t.IsReturnRequired == inQuery.IsReturnRequired) .WhereIf(inQuery.IsEnable != null, t => t.IsEnable == inQuery.IsEnable) .WhereIf(inQuery.IsDistinguishCriteria != null, t => t.IsDistinguishCriteria == inQuery.IsDistinguishCriteria) + .WhereIf(inQuery.BusinessModuleEnum != null, t => t.BusinessModuleEnum == inQuery.BusinessModuleEnum) .ProjectTo(_mapper.ConfigurationProvider, new { trialId = inQuery.TrialId }); return await emailNoticeConfigQueryable.ToPagedListAsync(inQuery); @@ -1293,8 +1294,8 @@ namespace IRaCIS.Core.Application.Service item.SMTPServerAddress = emailConfig.EmailSMTPServerAddress; item.FromName = emailConfig.EmailFromName; item.SMTPServerPort = emailConfig.EmailSMTPServerPort; - item.IsAutoSend = false; - item.IsEnable = false; + item.IsAutoSend = true; + item.IsEnable = true; item.TrialReadingCriterionId = list.FirstOrDefault(t => t.CriterionType == item.CriterionTypeEnum)?.TrialReadingCriterionId;