From e21ff9d2c1f07285e3341774a4afc23c46892b1a Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 21 Oct 2022 17:47:06 +0800
Subject: [PATCH] x

---
 .../Document/TrialEmailNoticeConfigService.cs | 57 ++++++++++++-------
 1 file changed, 37 insertions(+), 20 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
index 653bbeef9..e94a17ba0 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
@@ -304,24 +304,7 @@ namespace IRaCIS.Core.Application.Service
         public async Task<IResponseOutput> AddOrUpdateTrialEmailNoticeConfig(TrialEmailNoticeConfigAddOrEdit addOrEditTrialEmailNoticeConfig)
         {
 
-            List<TrialEmailNoticeUser> trialEmailNoticeUsers = new List<TrialEmailNoticeUser>();
-
-
-
-            trialEmailNoticeUsers.Add(new TrialEmailNoticeUser() { EmailUserType = EmailUserType.From, UserId = addOrEditTrialEmailNoticeConfig.FromUserId });
-
-
-            foreach (var item in addOrEditTrialEmailNoticeConfig.ToUserIdList)
-            {
-                trialEmailNoticeUsers.Add(new TrialEmailNoticeUser() { EmailUserType = EmailUserType.To, UserId = item });
-
-            }
-
-            foreach (var item in addOrEditTrialEmailNoticeConfig.CopyUserIdList)
-            {
-                trialEmailNoticeUsers.Add(new TrialEmailNoticeUser() { EmailUserType = EmailUserType.Copy, UserId = item });
-
-            }
+           
 
             //var entity = await _trialEmailNoticeConfigRepository.InsertOrUpdateAsync(addOrEditTrialEmailNoticeConfig);
 
@@ -331,10 +314,25 @@ namespace IRaCIS.Core.Application.Service
                 var entity = _mapper.Map<TrialEmailNoticeConfig>(addOrEditTrialEmailNoticeConfig);
 
 
-                entity.TrialEmailNoticeUserList = trialEmailNoticeUsers;
+    
+
+                entity.TrialEmailNoticeUserList.Add(new TrialEmailNoticeUser() { EmailUserType = EmailUserType.From, UserId = addOrEditTrialEmailNoticeConfig.FromUserId });
 
 
-                 await _trialEmailNoticeConfigRepository.AddAsync(entity, true);
+                foreach (var item in addOrEditTrialEmailNoticeConfig.ToUserIdList)
+                {
+                    entity.TrialEmailNoticeUserList.Add(new TrialEmailNoticeUser() { EmailUserType = EmailUserType.To, UserId = item });
+
+                }
+
+                foreach (var item in addOrEditTrialEmailNoticeConfig.CopyUserIdList)
+                {
+                    entity.TrialEmailNoticeUserList.Add(new TrialEmailNoticeUser() { EmailUserType = EmailUserType.Copy, UserId = item});
+
+                }
+
+
+                await _trialEmailNoticeConfigRepository.AddAsync(entity, true);
 
                 return ResponseOutput.Ok(entity.Id.ToString());
 
@@ -348,6 +346,25 @@ namespace IRaCIS.Core.Application.Service
 
                 var entity = (await _trialEmailNoticeConfigRepository.Where(t => t.Id == addOrEditTrialEmailNoticeConfig.Id, true, true).Include(t => t.TrialEmailNoticeUserList).FirstOrDefaultAsync()).IfNullThrowException();
 
+
+                List<TrialEmailNoticeUser> trialEmailNoticeUsers = new List<TrialEmailNoticeUser>();
+
+
+
+                trialEmailNoticeUsers.Add(new TrialEmailNoticeUser() { EmailUserType = EmailUserType.From, UserId = addOrEditTrialEmailNoticeConfig.FromUserId,TrialEmailNoticeConfigId=entity.Id });
+
+
+                foreach (var item in addOrEditTrialEmailNoticeConfig.ToUserIdList)
+                {
+                    trialEmailNoticeUsers.Add(new TrialEmailNoticeUser() { EmailUserType = EmailUserType.To, UserId = item, TrialEmailNoticeConfigId = entity.Id });
+
+                }
+
+                foreach (var item in addOrEditTrialEmailNoticeConfig.CopyUserIdList)
+                {
+                    trialEmailNoticeUsers.Add(new TrialEmailNoticeUser() { EmailUserType = EmailUserType.Copy, UserId = item, TrialEmailNoticeConfigId = entity.Id });
+
+                }
                 await _repository.AddRangeAsync(trialEmailNoticeUsers);
 
                 await _trialEmailNoticeConfigRepository.SaveChangesAsync();