IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs

@@ -46,20 +46,12 @@ namespace IRaCIS.Core.Application.Contracts
         {
             var verifyExp1 = new EntityVerifyExp<EmailNoticeConfig>()
             {
-                VerifyExp = t => t.BusinessScenarioEnum == addOrEditEmailNoticeConfig.BusinessScenarioEnum && t.CriterionTypeEnum == addOrEditEmailNoticeConfig.CriterionTypeEnum,
+                VerifyExp = t => t.BusinessScenarioEnum == addOrEditEmailNoticeConfig.BusinessScenarioEnum && t.CriterionTypeEnum== addOrEditEmailNoticeConfig.CriterionTypeEnum,
 
                 VerifyMsg = _localizer["EmailNoticeConfig_RepeatEmailScenario"]
 
             };
 
-            var verifyExp2 = new EntityVerifyExp<EmailNoticeConfig>()
-            {
-                VerifyExp = t => t.Code == addOrEditEmailNoticeConfig.Code && t.IsDistinguishCriteria == addOrEditEmailNoticeConfig.IsDistinguishCriteria && t.SystemLevel == addOrEditEmailNoticeConfig.SystemLevel,
-
-                VerifyMsg = _localizer["EmailNoticeConfig_RepeatCode"]
-
-            };
-
             // 匹配所有占位符的正则表达式，允许包含空格的占位符
             var regex = new Regex(@"\{\s*\d+\s*\}");
 
@@ -73,12 +65,12 @@ namespace IRaCIS.Core.Application.Contracts
 
        
 
-            var entity = new EmailNoticeConfig() { };
+            var entity=new EmailNoticeConfig() { };
 
             if (addOrEditEmailNoticeConfig.Id == null)
             {
 
-                entity = _mapper.Map<EmailNoticeConfig>(addOrEditEmailNoticeConfig);
+                 entity = _mapper.Map<EmailNoticeConfig>(addOrEditEmailNoticeConfig);
 
 
                 foreach (var item in addOrEditEmailNoticeConfig.ToUserTypeList)
@@ -94,7 +86,7 @@ namespace IRaCIS.Core.Application.Contracts
                 }
 
 
-                await _emailNoticeConfigrepository.AddAsync(entity, true, verifyExp1, verifyExp2);
+                await _emailNoticeConfigrepository.AddAsync(entity, true, verifyExp1);
 
              
             }
@@ -117,7 +109,7 @@ namespace IRaCIS.Core.Application.Contracts
                 }
 
 
-                entity = await _emailNoticeConfigrepository.UpdateFromDTOAsync(addOrEditEmailNoticeConfig, true, false, verifyExp1, verifyExp2);
+                 entity = await _emailNoticeConfigrepository.UpdateFromDTOAsync(addOrEditEmailNoticeConfig, true, false, verifyExp1);
 
              
 
@@ -125,18 +117,11 @@ namespace IRaCIS.Core.Application.Contracts
             }
 
 
-            if (entity.EmailCron != string.Empty)
+            if(entity.EmailCron != string.Empty && entity.IsAutoSend)
             {
                 var jobId = $"{entity.Id}_({entity.BusinessScenarioEnum})";
 
-                //有的job 可能编辑控制直接不发，需要移除已存在的
-                HangfireJobHelper.RemoveCronJob(jobId);
-
-                if (entity.IsAutoSend && entity.IsEnable)
-                {
-                    HangfireJobHelper.AddOrUpdateSystemCronJob(jobId, entity.BusinessScenarioEnum, entity.EmailCron);
-                }
-
+                HangfireJobHelper.AddOrUpdateSystemCronJob(jobId, entity.BusinessScenarioEnum, entity.EmailCron);
             }
           
 

IRaCIS.Core.Application/Service/Common/ExcelExportService.cs

@@ -1658,8 +1658,8 @@ namespace IRaCIS.Core.Application.Service.Common
         {
             var emailNoticeConfigQueryable = _emailNoticeConfigrepository
             //.WhereIf(inQuery.SystemLevel == null, t => t.SystemLevel == SysEmailLevel.not_sys)
-            .WhereIf(inQuery.SystemLevel != null, t => t.SystemLevel == inQuery.SystemLevel)
-            .WhereIf(inQuery.IsDistinguishCriteria != null, t => t.IsDistinguishCriteria == inQuery.IsDistinguishCriteria)
+            //.WhereIf(inQuery.SystemLevel != null, t => t.SystemLevel == inQuery.SystemLevel)
+            //.WhereIf(inQuery.IsDistinguishCriteria != null, t => t.IsDistinguishCriteria == inQuery.IsDistinguishCriteria)
             .WhereIf(inQuery.CriterionTypeEnum != null, t => t.CriterionTypeEnum == inQuery.CriterionTypeEnum)
             .WhereIf(inQuery.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == inQuery.BusinessScenarioEnum)
             .WhereIf(inQuery.IsReturnRequired != null, t => t.IsReturnRequired == inQuery.IsReturnRequired)