#1108 合并master冲突

2025-06-18 20:08:15 +08:00 · 2022-05-21 03:11:07 +08:00
parent cdc9b1c507 04ba968b61
commit e956d5313c
8 changed files with 150 additions and 26 deletions
--- a/FreeSql.DbContext/Repository/Repository/BaseRepository.cs
+++ b/FreeSql.DbContext/Repository/Repository/BaseRepository.cs
@ -29,6 +29,15 @@ namespace FreeSql
            DataFilterUtil.SetRepositoryDataFilter(this, null);
            DataFilter.Apply("", filter);
            AsTable(asTable);
+
+            fsql.GlobalFilter.GetFilters().ForEach(gf =>
+            {
+                (DataFilter as DataFilter<TEntity>)._filtersByOrm.TryAdd(gf.Name, new DataFilter<TEntity>.FilterItemByOrm
+                {
+                    Filter = gf,
+                    IsEnabled = true
+                });
+            });
        }

        ~BaseRepository() => this.Dispose();