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 @@ + + + 批量注入 Repository,可以参考代码自行调整 + + + + + + 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() + + .WithSql( + g.sqlserver.Select().ToSql(a => new { a.Id }, FieldAliasOptions.AsProperty) + + " UNION ALL " + + g.sqlserver.Select().ToSql(a => new { a.Id }, FieldAliasOptions.AsProperty)) + + .Page(1, 10).ToSql("Id"); + + var sqlextGroupConcat = g.mysql.Select() .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;