From 18b5605b47037f918846f475202c688b8d804220 Mon Sep 17 00:00:00 2001
From: Argo-Cloud <argo@163.com>
Date: Mon, 22 Mar 2021 13:37:01 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20EFCore=20?=
 =?UTF-8?q?=E6=89=A9=E5=B1=95=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E7=BC=BA?=
 =?UTF-8?q?=E5=A4=B1=20Filter=20=E5=88=A4=E6=96=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DefaultDataService.cs                                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/DefaultDataService.cs b/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/DefaultDataService.cs
index 28327a0e6..bd6e40dbc 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<TModel>()
                 .Count(out var count)
-                .Where(option.Filters.Concat(option.Searchs).GetFilterLambda<TModel>(), option.Searchs.Any())
+                .Where(option.Filters.Concat(option.Searchs).GetFilterLambda<TModel>(), option.Filters.Any() || option.Searchs.Any())
                 .Sort(option.SortName!, option.SortOrder, !string.IsNullOrEmpty(option.SortName))
                 .Page((option.PageIndex - 1) * option.PageItems, option.PageItems);
 
-- 
Gitee


From 5c578ae9dca452532ab00e724e5f3db85a485092 Mon Sep 17 00:00:00 2001
From: Argo-Cloud <argo@163.com>
Date: Mon, 22 Mar 2021 13:37:22 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20EFCore=20?=
 =?UTF-8?q?=E6=89=A9=E5=B1=95=E5=AF=BC=E8=87=B4=E9=AB=98=E7=BA=A7=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E9=AB=98=E4=BA=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DefaultDataService.cs                                      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/DefaultDataService.cs b/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/DefaultDataService.cs
index bd6e40dbc..4c0e60236 100644
--- a/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/DefaultDataService.cs
+++ b/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/DefaultDataService.cs
@@ -106,8 +106,7 @@ namespace BootstrapBlazor.DataAcces.EntityFrameworkCore
                 TotalCount = count,
                 Items = query,
                 IsSorted = true,
-                IsFiltered = true,
-                IsSearch = true
+                IsFiltered = true
             };
             return Task.FromResult(ret);
         }
-- 
Gitee


From baa1fb04d83c15ac2b1925ad53e4396c879c07c4 Mon Sep 17 00:00:00 2001
From: Argo-Cloud <argo@163.com>
Date: Mon, 22 Mar 2021 13:37:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=AF=BC=E8=87=B4=E9=80=92=E5=BD=92=E6=97=A0?=
 =?UTF-8?q?=E9=99=90=E5=BE=AA=E7=8E=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IQueryableExtensions.cs                                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/IQueryableExtensions.cs b/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/IQueryableExtensions.cs
index 2c069a196..a29063e20 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
         /// <param name="condition"></param>
         /// <param name="predicate"></param>
         /// <returns></returns>
-        public static IQueryable<T> Where<T>(this IQueryable<T> queryable, Expression<Func<T, bool>> predicate, bool condition = true) => condition ? queryable.Where(predicate) : queryable;
+        public static IQueryable<T> Where<T>(this IQueryable<T> queryable, Expression<Func<T, bool>> predicate, bool condition) => condition ? queryable.Where(predicate) : queryable;
 
         /// <summary>
         /// 排序
@@ -33,7 +33,7 @@ namespace BootstrapBlazor.DataAcces.EntityFrameworkCore
         /// <param name="sortOrder"></param>
         /// <param name="condition"></param>
         /// <returns></returns>
-        public static IQueryable<T> Sort<T>(this IQueryable<T> queryable, string sortName, SortOrder sortOrder, bool condition = true) => condition ? queryable.Sort(sortName, sortOrder) : queryable;
+        public static IQueryable<T> Sort<T>(this IQueryable<T> queryable, string sortName, SortOrder sortOrder, bool condition) => condition ? queryable.Sort(sortName, sortOrder) : queryable;
 
         /// <summary>
         /// 分页
-- 
Gitee