diff --git a/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/DefaultDataService.cs b/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/DefaultDataService.cs index 28327a0e69a9f6f9f969ec9441be19ca0168c52c..4c0e60236af5f7632a73c3094926bd0cab48f0e7 100644 --- a/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/DefaultDataService.cs +++ b/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/DefaultDataService.cs @@ -97,7 +97,7 @@ namespace BootstrapBlazor.DataAcces.EntityFrameworkCore // 处理过滤与高级搜索 var query = _db.Set() .Count(out var count) - .Where(option.Filters.Concat(option.Searchs).GetFilterLambda(), option.Searchs.Any()) + .Where(option.Filters.Concat(option.Searchs).GetFilterLambda(), option.Filters.Any() || option.Searchs.Any()) .Sort(option.SortName!, option.SortOrder, !string.IsNullOrEmpty(option.SortName)) .Page((option.PageIndex - 1) * option.PageItems, option.PageItems); @@ -106,8 +106,7 @@ namespace BootstrapBlazor.DataAcces.EntityFrameworkCore TotalCount = count, Items = query, IsSorted = true, - IsFiltered = true, - IsSearch = true + IsFiltered = true }; return Task.FromResult(ret); } diff --git a/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/IQueryableExtensions.cs b/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/IQueryableExtensions.cs index 2c069a196b29123f43fcd876bc44190ad9bacb00..a29063e2072210d16ef759dcb5d7d1516cae6d3d 100644 --- a/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/IQueryableExtensions.cs +++ b/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/IQueryableExtensions.cs @@ -22,7 +22,7 @@ namespace BootstrapBlazor.DataAcces.EntityFrameworkCore /// /// /// - public static IQueryable Where(this IQueryable queryable, Expression> predicate, bool condition = true) => condition ? queryable.Where(predicate) : queryable; + public static IQueryable Where(this IQueryable queryable, Expression> predicate, bool condition) => condition ? queryable.Where(predicate) : queryable; /// /// 排序 @@ -33,7 +33,7 @@ namespace BootstrapBlazor.DataAcces.EntityFrameworkCore /// /// /// - public static IQueryable Sort(this IQueryable queryable, string sortName, SortOrder sortOrder, bool condition = true) => condition ? queryable.Sort(sortName, sortOrder) : queryable; + public static IQueryable Sort(this IQueryable queryable, string sortName, SortOrder sortOrder, bool condition) => condition ? queryable.Sort(sortName, sortOrder) : queryable; /// /// 分页