From 84163660bf4a9b230528c41fcabb4af7dc3c8160 Mon Sep 17 00:00:00 2001
From: colin <colin.in@foxmail.com>
Date: Fri, 22 Nov 2024 09:25:00 +0800
Subject: [PATCH] feat(data-protected): added the default filtering
 configuration for entities

---
 .../Abp/DataProtection/AbpDataProtectionOptions.cs   | 12 +++++++++---
 .../Abp/DataProtection/EntityTypeFilterBuilder.cs    |  7 +++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/aspnet-core/framework/data-protection/LINGYUN.Abp.DataProtection/LINGYUN/Abp/DataProtection/AbpDataProtectionOptions.cs b/aspnet-core/framework/data-protection/LINGYUN.Abp.DataProtection/LINGYUN/Abp/DataProtection/AbpDataProtectionOptions.cs
index 9beede4f8..a27a4f65d 100644
--- a/aspnet-core/framework/data-protection/LINGYUN.Abp.DataProtection/LINGYUN/Abp/DataProtection/AbpDataProtectionOptions.cs
+++ b/aspnet-core/framework/data-protection/LINGYUN.Abp.DataProtection/LINGYUN/Abp/DataProtection/AbpDataProtectionOptions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
 using Volo.Abp.Auditing;
 using Volo.Abp.Data;
 using Volo.Abp.Domain.Entities;
@@ -16,15 +17,19 @@ public class AbpDataProtectionOptions
     /// <summary>
     /// 权限主体
     /// </summary>
-    public IList<IDataAccessSubjectContributor> SubjectContributors { get; set; }
+    public IList<IDataAccessSubjectContributor> SubjectContributors { get; }
     /// <summary>
     /// 过滤字段关键字
     /// </summary>
-    public IDictionary<string, IDataAccessKeywordContributor> KeywordContributors { get; set; }
+    public IDictionary<string, IDataAccessKeywordContributor> KeywordContributors { get; }
     /// <summary>
     /// 数据操作
     /// </summary>
-    public IDictionary<DataAccessFilterOperate, IDataAccessOperateContributor> OperateContributors { get; set; }
+    public IDictionary<DataAccessFilterOperate, IDataAccessOperateContributor> OperateContributors { get; }
+    /// <summary>
+    /// 默认实体过滤
+    /// </summary>
+    public IDictionary<Type, Func<IServiceProvider, Type, DataAccessOperation, LambdaExpression>> DefaultEntityFilters { get; }
     /// <summary>
     /// 忽略审计字段列表
     /// </summary>
@@ -35,6 +40,7 @@ public class AbpDataProtectionOptions
         SubjectContributors = new List<IDataAccessSubjectContributor>();
         KeywordContributors = new Dictionary<string, IDataAccessKeywordContributor>();
         OperateContributors = new Dictionary<DataAccessFilterOperate, IDataAccessOperateContributor>();
+        DefaultEntityFilters = new Dictionary<Type, Func<IServiceProvider, Type, DataAccessOperation, LambdaExpression>>();
 
         IgnoreAuditedProperties = new List<string>
         {
diff --git a/aspnet-core/framework/data-protection/LINGYUN.Abp.DataProtection/LINGYUN/Abp/DataProtection/EntityTypeFilterBuilder.cs b/aspnet-core/framework/data-protection/LINGYUN.Abp.DataProtection/LINGYUN/Abp/DataProtection/EntityTypeFilterBuilder.cs
index f5f3cd4f9..0d5e358ff 100644
--- a/aspnet-core/framework/data-protection/LINGYUN.Abp.DataProtection/LINGYUN/Abp/DataProtection/EntityTypeFilterBuilder.cs
+++ b/aspnet-core/framework/data-protection/LINGYUN.Abp.DataProtection/LINGYUN/Abp/DataProtection/EntityTypeFilterBuilder.cs
@@ -61,6 +61,13 @@ public class EntityTypeFilterBuilder : IEntityTypeFilterBuilder, ITransientDepen
         }
 
         LambdaExpression subExp = null;
+
+        if (subjectFilterGroups.Count == 0 &&
+            _options.DefaultEntityFilters.TryGetValue(entityType, out var filterFunc))
+        {
+            subExp = filterFunc(_serviceProvider, entityType, operation);
+        }
+
         foreach (var subGroup in subjectFilterGroups)
         {
             subExp = subExp == null ? GetExpression(entityType, subGroup) : subExp.OrElse(func, GetExpression(entityType, subGroup));