From 35dbcf5a11c866fcbdc31458543cfbd0723d41d9 Mon Sep 17 00:00:00 2001
From: Argo-Cloud <argo@163.com>
Date: Tue, 23 Mar 2021 18:37:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20EFCore=20?=
 =?UTF-8?q?=E9=A1=B5=E7=A0=81=E4=B8=8D=E6=AD=A3=E7=A1=AE=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 4c0e60236..a457dfba5 100644
--- a/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/DefaultDataService.cs
+++ b/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/DefaultDataService.cs
@@ -96,9 +96,9 @@ namespace BootstrapBlazor.DataAcces.EntityFrameworkCore
         {
             // 处理过滤与高级搜索
             var query = _db.Set<TModel>()
-                .Count(out var count)
                 .Where(option.Filters.Concat(option.Searchs).GetFilterLambda<TModel>(), option.Filters.Any() || option.Searchs.Any())
                 .Sort(option.SortName!, option.SortOrder, !string.IsNullOrEmpty(option.SortName))
+                .Count(out var count)
                 .Page((option.PageIndex - 1) * option.PageItems, option.PageItems);
 
             var ret = new QueryData<TModel>()
-- 
Gitee


From d1a5510bbd06a1421cebf0cf2d12287421e65129 Mon Sep 17 00:00:00 2001
From: Argo-Cloud <argo@163.com>
Date: Tue, 23 Mar 2021 18:40:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?release:=20=E5=8F=91=E5=B8=83=205.0.12-beta?=
 =?UTF-8?q?02?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BootstrapBlazor.DataAcces.EntityFrameworkCore.csproj        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/BootstrapBlazor.DataAcces.EntityFrameworkCore.csproj b/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/BootstrapBlazor.DataAcces.EntityFrameworkCore.csproj
index dba8de856..188cd7ef9 100644
--- a/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/BootstrapBlazor.DataAcces.EntityFrameworkCore.csproj
+++ b/src/Extensions/DataServices/BootstrapBlazor.DataAcces.EntityFrameworkCore/BootstrapBlazor.DataAcces.EntityFrameworkCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>5.0.12-beta01</Version>
+    <Version>5.0.12-beta02</Version>
   </PropertyGroup>
 
   <ItemGroup>
-- 
Gitee