From 44bcdf797322e49fe7932f08a186a6d01c7babaf Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 25 Jul 2024 14:46:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=82=AE=E4=BB=B6=E4=B8=8A?=
=?UTF-8?q?=E7=BA=BF=E5=88=B0=E9=85=8D=E7=BD=AE=E9=A2=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Service/Common/DTO/EmailNoticeConfigViewModel.cs | 2 ++
.../Service/Common/EmailNoticeConfigService.cs | 2 +-
IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs
index 691b1e8bf..211be32dc 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs
@@ -63,6 +63,8 @@ namespace IRaCIS.Core.Application.Contracts
public bool? IsDistinguishCriteria { get; set; }
+ public bool IsSystemLevel { get; set; } = false;
+
}
/// EmailNoticeConfigAddOrEdit 列表查询参数模型
diff --git a/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs
index aa07c35c1..b634370e5 100644
--- a/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs
@@ -28,7 +28,7 @@ namespace IRaCIS.Core.Application.Contracts
[HttpPost]
public async Task> GetEmailNoticeConfigList(EmailNoticeConfigQuery queryEmailNoticeConfig)
{
- var emailNoticeConfigQueryable = _emailNoticeConfigrepository
+ var emailNoticeConfigQueryable = _emailNoticeConfigrepository.Where(t=>t.IsSystemLevel==queryEmailNoticeConfig.IsSystemLevel)
.WhereIf(queryEmailNoticeConfig.IsDistinguishCriteria != null, t => t.IsDistinguishCriteria == queryEmailNoticeConfig.IsDistinguishCriteria)
.WhereIf(queryEmailNoticeConfig.CriterionTypeEnum != null, t => t.CriterionTypeEnum == queryEmailNoticeConfig.CriterionTypeEnum)
.WhereIf(queryEmailNoticeConfig.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == queryEmailNoticeConfig.BusinessScenarioEnum)
diff --git a/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs b/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs
index 74ab2ac60..31c4dfec9 100644
--- a/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs
+++ b/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs
@@ -69,6 +69,7 @@ namespace IRaCIS.Core.Domain.Models
+ public bool IsSystemLevel { get; set; }
///
/// 是否区分标准