From 181813ce1a1f783a07de577a305f2c7aef738230 Mon Sep 17 00:00:00 2001
From: 28810 <28810@YEXIANGQIN>
Date: Fri, 3 Jul 2020 15:04:07 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=20WhereDynamicFilter=20?=
 =?UTF-8?q?=E5=A4=9A=E7=BA=A7=20Logic=20=E6=9C=AA=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=E7=9A=84=20bug=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FreeSql.DbContext/FreeSql.DbContext.xml                |  9 +++++++++
 FreeSql.Tests/FreeSql.Tests/UnitTest3.cs               | 10 ++++++++++
 .../CommonProvider/SelectProvider/Select0Provider.cs   |  2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
index 474ea8d5..4854f49c 100644
--- a/FreeSql.DbContext/FreeSql.DbContext.xml
+++ b/FreeSql.DbContext/FreeSql.DbContext.xml
@@ -486,5 +486,14 @@
             <param name="that"></param>
             <returns></returns>
         </member>
+        <member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{FreeSql.FluentDataFilter},System.Reflection.Assembly[])">
+            <summary>
+            批量注入 Repository，可以参考代码自行调整
+            </summary>
+            <param name="services"></param>
+            <param name="globalDataFilter"></param>
+            <param name="assemblies"></param>
+            <returns></returns>
+        </member>
     </members>
 </doc>
diff --git a/FreeSql.Tests/FreeSql.Tests/UnitTest3.cs b/FreeSql.Tests/FreeSql.Tests/UnitTest3.cs
index 75026510..8ea5fe0f 100644
--- a/FreeSql.Tests/FreeSql.Tests/UnitTest3.cs
+++ b/FreeSql.Tests/FreeSql.Tests/UnitTest3.cs
@@ -159,6 +159,16 @@ namespace FreeSql.Tests
         [Fact]
         public void Test03()
         {
+            var sql123 = g.sqlserver.Select<Edi>()
+
+                .WithSql(
+                    g.sqlserver.Select<Edi>().ToSql(a => new { a.Id }, FieldAliasOptions.AsProperty) + 
+                    " UNION ALL " +
+                    g.sqlserver.Select<Edi>().ToSql(a => new { a.Id }, FieldAliasOptions.AsProperty))
+                
+                .Page(1, 10).ToSql("Id");
+
+
             var sqlextGroupConcat = g.mysql.Select<Edi, EdiItem>()
                 .InnerJoin((a, b) => b.Id == a.Id)
                 .ToSql((a, b) => new
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
index 79fb1956..dd0f788b 100644
--- a/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
+++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
@@ -1169,7 +1169,7 @@ namespace FreeSql.Internal.CommonProvider
                 {
                     if (string.IsNullOrEmpty(fi.Field) == false || fi.Filters?.Any() == true)
                     {
-                        switch (filter.Logic)
+                        switch (logic)
                         {
                             case DynamicFilterLogic.And: sb.Append(" AND "); break;
                             case DynamicFilterLogic.Or: sb.Append(" OR "); break;