新增会员过滤器

zhontai · Nov 16, 2022 · fd60021 · fd60021
1 parent a9d56e1
commit fd60021
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/src/platform/ZhonTai.Admin/Core/Consts/FilterNames.cs b/src/platform/ZhonTai.Admin/Core/Consts/FilterNames.cs
@@ -30,4 +30,10 @@ public static partial class FilterNames
     /// </summary>
     [Description("数据权限")]
     public const string Data = "Data";
+
+    /// <summary>
+    /// 会员
+    /// </summary>
+    [Description("会员")]
+    public const string Member = "Member";
 }
diff --git a/src/platform/ZhonTai.Admin/Core/Db/Data/SyncData.cs b/src/platform/ZhonTai.Admin/Core/Db/Data/SyncData.cs
@@ -7,6 +7,7 @@
 using FreeSql.DataAnnotations;
 using ZhonTai.Common.Helpers;
 using ZhonTai.Admin.Core.Configs;
+using ZhonTai.Admin.Core.Consts;
 
 namespace ZhonTai.Admin.Core.Db.Data;
 
@@ -56,7 +57,7 @@ protected virtual async Task InitDataAsync<T>(
 
         try
         {
-            if (await db.Queryable<T>().AnyAsync())
+            if (await db.Queryable<T>().DisableGlobalFilter(FilterNames.Tenant, FilterNames.Member).AnyAsync())
             {
                 Console.WriteLine($" table: {tableName} record already exists");
                 return;

diff --git a/src/platform/ZhonTai.Admin/Core/Db/DbHelper.cs b/src/platform/ZhonTai.Admin/Core/Db/DbHelper.cs
@@ -466,9 +466,12 @@ HostAppOptions hostAppOptions
             //租户过滤器
             if (appConfig.Tenant)
             {
-                fsql.GlobalFilter.ApplyOnlyIf<ITenant>(FilterNames.Tenant, () => user?.Id > 0, a => a.TenantId == user.TenantId);
+                fsql.GlobalFilter.ApplyOnly<ITenant>(FilterNames.Tenant, a => a.TenantId == user.TenantId);
             }
 
+            //会员过滤器
+            fsql.GlobalFilter.ApplyOnly<IMember>(FilterNames.Member, a => a.MemberId == user.MemberId);
+
             //数据权限过滤器
             fsql.GlobalFilter.ApplyOnlyIf<IData>(FilterNames.Self,
                 () =>

diff --git a/src/platform/ZhonTai.Admin/ZhonTai.Admin.xml b/src/platform/ZhonTai.Admin/ZhonTai.Admin.xml