From 32d6cce33e51ba2e93232a88ffde35e2d9f87b56 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 1 Dec 2023 13:59:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=BE=AA=E7=8E=AF=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Document/EmailSendService.cs            | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Document/EmailSendService.cs b/IRaCIS.Core.Application/Service/Document/EmailSendService.cs
index 68294b207..9200fda77 100644
--- a/IRaCIS.Core.Application/Service/Document/EmailSendService.cs
+++ b/IRaCIS.Core.Application/Service/Document/EmailSendService.cs
@@ -43,18 +43,19 @@ namespace IRaCIS.Core.Application.Service
 
         private readonly IRepository<Trial> _trialRepository;
 
-        private readonly IDictionaryService _dictionaryService;
         private readonly IOptionsMonitor<SystemEmailSendConfig> _SystemEmailSendConfig;
 
         public readonly static string EmailNamePlaceholder = "EmailNamePlaceholder";
 
-        public EmailSendService(IRepository<TrialEmailNoticeConfig> trialEmailNoticeConfigRepository, IRepository<EmailNoticeConfig> emailNoticeConfigRepository, IRepository<Trial> trialRepository, IOptionsMonitor<SystemEmailSendConfig> systemEmailSendConfig, IDictionaryService dictionaryService)
+        private readonly IRepository<Dictionary> _dictionaryRepository;
+
+        public EmailSendService(IRepository<TrialEmailNoticeConfig> trialEmailNoticeConfigRepository, IRepository<EmailNoticeConfig> emailNoticeConfigRepository, IRepository<Trial> trialRepository, IOptionsMonitor<SystemEmailSendConfig> systemEmailSendConfig,IRepository<Dictionary> dictionaryRepository)
         {
             _trialEmailNoticeConfigRepository = trialEmailNoticeConfigRepository;
             _emailNoticeConfigRepository = emailNoticeConfigRepository;
             _trialRepository = trialRepository;
             _SystemEmailSendConfig = systemEmailSendConfig;
-            _dictionaryService = dictionaryService;
+            _dictionaryRepository=dictionaryRepository;
         }
 
         //入组确认/PD确认
@@ -311,7 +312,11 @@ namespace IRaCIS.Core.Application.Service
 
             var needTranslateDicNameList = answerList.Where(t => !string.IsNullOrEmpty(t.DictionaryCode)).Select(t => t.DictionaryCode).ToList();
 
-            var translateDataList = await _dictionaryService.GetBasicDataSelect(needTranslateDicNameList.ToArray());
+
+            var searchList = await _dictionaryRepository.Where(t => needTranslateDicNameList.ToArray().Contains(t.Parent.Code) && t.ParentId != null && t.IsEnable).ProjectTo<BasicDicSelectCopy>(_mapper.ConfigurationProvider, new { isEn_Us = _userInfo.IsEn_Us }).ToListAsync();
+
+            var translateDataList = searchList.GroupBy(t => t.ParentCode).ToDictionary(g => g.Key, g => g.OrderBy(t => t.ShowOrder).ToList());
+
 
 
             Func<bool, string, string, string> transFunc = (bool isNeedTranslate, string dicCode, string answer) =>