From efcb3cf168cc30991e00ae3b4b0af7aeba555379 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 14 Nov 2024 15:16:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85=E5=8C=96bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Common/EmailNoticeConfigService.cs                 | 3 ++-
 IRaCIS.Core.Application/Service/Common/_MapConfig.cs           | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs
index 342586b6f..af8653df5 100644
--- a/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs
@@ -44,9 +44,10 @@ namespace IRaCIS.Core.Application.Contracts
         {
             var verifyExp1 = new EntityVerifyExp<EmailNoticeConfig>()
             {
-                VerifyExp = t => t.BusinessScenarioEnum == addOrEditEmailNoticeConfig.BusinessScenarioEnum,
+                VerifyExp = t => t.BusinessScenarioEnum == addOrEditEmailNoticeConfig.BusinessScenarioEnum && t.CriterionTypeEnum== addOrEditEmailNoticeConfig.CriterionTypeEnum,
 
                 VerifyMsg = _localizer["EmailNoticeConfig_RepeatEmailScenario"]
+
             };
 
             // 匹配所有占位符的正则表达式，允许包含空格的占位符
diff --git a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs
index d55d78cb9..fca2fa4da 100644
--- a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs
@@ -76,6 +76,9 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<Internationalization, InternationalizationAddOrEdit>().ReverseMap();
 
+            CreateMap<InternationalizationAddOrEdit, IRCGlobalInfoDTO>();
+            
+
             CreateMap<Internationalization, BatchInternationalizationDto>().ReverseMap();
 
             CreateMap<Internationalization, IRCGlobalInfoDTO>();