From 792f7b8adeb450a4e20fc5aa451a93bfe0be7907 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 26 Oct 2022 15:13:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DTO/TrialEmailNoticeConfigViewModel.cs     |  2 +-
 .../Document/TrialEmailNoticeConfigService.cs  | 18 +++++++++---------
 .../Document/TrialEmailNoticeConfig.cs         |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs b/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs
index 21d8a19e4..e1ba5a1de 100644
--- a/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs
@@ -82,7 +82,7 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public CriterionType CriterionTypeEnum { get; set; }
 
-
+        public string FromName { get; set; } = string.Empty;
 
         public string FromEmail { get; set; }
 
diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
index c62bf4f27..96706be7a 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
@@ -130,7 +130,7 @@ namespace IRaCIS.Core.Application.Service
             }
 
             //邮件内容html
-            var (isNeedSend, templateStream) = await FillWordTemplateAndSetEmailAsync(visitTaskId, sendEmailConfig, businessScenarioEnum, emailConfig.FilePath, path);
+            var isNeedSend = await FillWordTemplateAndSetEmailAsync(visitTaskId, sendEmailConfig, businessScenarioEnum, emailConfig.FilePath, path);
 
            
 
@@ -144,7 +144,7 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-        private async Task<(bool IsNeedSend,FileStream? TemplateStream)> FillWordTemplateAndSetEmailAsync(Guid visitTaskId, SMTPEmailConfig sendEmailConfig, CommonDocumentBusinessScenario businessScenarioEnum, string  fileName,string filePath)
+        private async Task<bool> FillWordTemplateAndSetEmailAsync(Guid visitTaskId, SMTPEmailConfig sendEmailConfig, CommonDocumentBusinessScenario businessScenarioEnum, string  fileName,string filePath)
         {
 
             var isNeedSend = true;
@@ -197,7 +197,7 @@ namespace IRaCIS.Core.Application.Service
             else
             {
                 //isNeedSend = false;
-                return (false,null);
+                return false;
             }
 
             //入组确认仅在基线
@@ -211,7 +211,7 @@ namespace IRaCIS.Core.Application.Service
                 {
                     //isNeedSend = false;
 
-                    return (false, null);
+                    return false;
                 }
 
                 sendEmailConfig.TopicDescription = "入组确认";
@@ -329,7 +329,7 @@ namespace IRaCIS.Core.Application.Service
                             {
                                 //isNeedSend = false;
 
-                                return (false, null);
+                                return false;
                             }
 
                            
@@ -393,7 +393,7 @@ namespace IRaCIS.Core.Application.Service
                                 {
                                     //isNeedSend = false;
 
-                                    return (false, null);
+                                    return false;
                                 }
                             }
 
@@ -446,7 +446,7 @@ namespace IRaCIS.Core.Application.Service
                         else
                         {
                             //isNeedSend = false;
-                            return (false, null);
+                            return false;
                         }
 
                     }
@@ -476,11 +476,11 @@ namespace IRaCIS.Core.Application.Service
                     FileStream = docFileStream
                 });
 
-                return (false, null);
+                return false;
             }
             else
             {
-                return (false, null);
+                return false;
             }
         }
 
diff --git a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs
index b59d18231..a2bf657b3 100644
--- a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs
+++ b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs
@@ -26,7 +26,7 @@ namespace IRaCIS.Core.Domain.Models
 		public string AuthorizationCode { get; set; } = string.Empty;
 
 
-
+		public string FromName { get; set; } = string.Empty;
 		public List<TrialEmailNoticeUser> TrialEmailNoticeUserList { get; set; } = new List<TrialEmailNoticeUser>();