From 262a4be1d1940bf4d07ae45c1014ba297639b528 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Tue, 9 Apr 2019 19:20:24 +0800 Subject: [PATCH] Filter Bug --- Src/Asp.Net/MySqlTest/Config.cs | 6 +++--- Src/Asp.Net/MySqlTest/Demos/7_Filter.cs | 2 +- .../Abstract/QueryableProvider/QueryableProvider.cs | 2 +- .../SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Src/Asp.Net/MySqlTest/Config.cs b/Src/Asp.Net/MySqlTest/Config.cs index b3b355553..48e302503 100644 --- a/Src/Asp.Net/MySqlTest/Config.cs +++ b/Src/Asp.Net/MySqlTest/Config.cs @@ -8,8 +8,8 @@ namespace OrmTest { public class Config { - public static string ConnectionString = "server=localhost;Database=SqlSugar4xTest;Uid=root;Pwd=root"; - public static string ConnectionString2 = "server=localhost;Database=SQLSUGAR4XTEST;Uid=root;Pwd=root"; - public static string ConnectionString3 = "server=localhost;Database=sqlsugar4xtest;Uid=root;Pwd=root"; + public static string ConnectionString = "server=localhost;Database=SqlSugar4xTest;Uid=root;Pwd=haosql"; + public static string ConnectionString2 = "server=localhost;Database=SQLSUGAR4XTEST;Uid=root;Pwd=haosql"; + public static string ConnectionString3 = "server=localhost;Database=sqlsugar4xtest;Uid=root;Pwd=haosql"; } } diff --git a/Src/Asp.Net/MySqlTest/Demos/7_Filter.cs b/Src/Asp.Net/MySqlTest/Demos/7_Filter.cs index 5aa6ffbb5..b90702e4f 100644 --- a/Src/Asp.Net/MySqlTest/Demos/7_Filter.cs +++ b/Src/Asp.Net/MySqlTest/Demos/7_Filter.cs @@ -17,7 +17,7 @@ namespace OrmTest.Demo //gobal filter var db = GetInstance1(); - var sql = db.Queryable().ToSql(); + var sql = db.Queryable().OrderBy(it=>it.Id).ToSql(); //SELECT [ID],[SchoolId],[Name],[CreateTime] FROM [STudent] WHERE isDelete=0 var sql2 = db.Queryable((f, s) => new object[] { JoinType.Left, f.SchoolId == s.Id }).ToSql(); diff --git a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs index 229940f03..79d611bdc 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs @@ -1207,7 +1207,7 @@ namespace SqlSugar foreach (var item in list) { var filterResult = item.FilterValue(this.Context); - Where(filterResult.Sql, filterResult.Parameters); + Where(filterResult.Sql+UtilConstants.Space, filterResult.Parameters); } } } diff --git a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs index a9d25566b..1a4a31a46 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs @@ -285,7 +285,7 @@ namespace SqlSugar foreach (var item in gobalFilterList.Where(it => it.IsJoinQuery == !IsSingle())) { var filterResult = item.FilterValue(this.Context); - WhereInfos.Add(this.Builder.AppendWhereOrAnd(this.WhereInfos.IsNullOrEmpty(), filterResult.Sql)); + WhereInfos.Add(this.Builder.AppendWhereOrAnd(this.WhereInfos.IsNullOrEmpty(), filterResult.Sql+UtilConstants.Space)); var filterParamters = this.Context.Ado.GetParameters(filterResult.Parameters); if (filterParamters.HasValue()) {