diff --git a/OrmTest/UnitTest/Query/SelectQuery.cs b/OrmTest/UnitTest/Query/SelectQuery.cs index f8a7c37ed..393c32b22 100644 --- a/OrmTest/UnitTest/Query/SelectQuery.cs +++ b/OrmTest/UnitTest/Query/SelectQuery.cs @@ -40,10 +40,11 @@ namespace OrmTest.UnitTest JoinType.Left,st.SchoolId==sc.Id }).Where(st => st.Id > 0).Select("*").ToList(); - //var list3 = db.Queryable("Student","st") - // .AddJoinInfo("Shool","sh", "sh.id=st.shoolid") - // .Where(st => st.Id > 0) - // .Select(st => new ViewModelStudent2 { Student = st }).ToList(); + var list3 = db.Queryable("Student", "st") + .AddJoinInfo("School", "sh", "sh.id=st.schoolid") + .Where("st.id>@id") + .AddParameters(new {id=1}) + .Select("st.*").ToList(); } } diff --git a/SqlSugar/Abstract/QueryableProvider/QueryableAccessory.cs b/SqlSugar/Abstract/QueryableProvider/QueryableAccessory.cs index b2f06588e..4e2d5b1f4 100644 --- a/SqlSugar/Abstract/QueryableProvider/QueryableAccessory.cs +++ b/SqlSugar/Abstract/QueryableProvider/QueryableAccessory.cs @@ -37,7 +37,7 @@ namespace SqlSugar ILambdaExpressions resolveExpress = context.LambdaExpressions; resolveExpress.Resolve(expression, type); Pars.AddRange(resolveExpress.Parameters); - builder.LambadaQueryBuilder.WhereInfos.Add(resolveExpress.Result.GetResultString()); + builder.LambadaQueryBuilder.WhereInfos.Add(builder.AppendWhereOrAnd(builder.LambadaQueryBuilder.WhereInfos.IsNullOrEmpty(),resolveExpress.Result.GetResultString())); resolveExpress.Clear(); } diff --git a/SqlSugar/Abstract/SqlBuilderProvider/DMLBuilder/LambadaQueryBuilder.cs b/SqlSugar/Abstract/SqlBuilderProvider/DMLBuilder/LambadaQueryBuilder.cs index 3dd4f53d1..e71e113d6 100644 --- a/SqlSugar/Abstract/SqlBuilderProvider/DMLBuilder/LambadaQueryBuilder.cs +++ b/SqlSugar/Abstract/SqlBuilderProvider/DMLBuilder/LambadaQueryBuilder.cs @@ -122,7 +122,7 @@ namespace SqlSugar if (this.WhereInfos == null) return null; else { - return " WHERE " + string.Join(" ", this.WhereInfos); + return string.Join(" ", this.WhereInfos); } } } diff --git a/SqlSugar/DetaultT.cs b/SqlSugar/DetaultT.cs index 5840e45a3..9ed9cd4a8 100644 --- a/SqlSugar/DetaultT.cs +++ b/SqlSugar/DetaultT.cs @@ -1,6 +1,7 @@ namespace SqlSugar { - public class DetaultT + public class SugarDynamic { + } } \ No newline at end of file diff --git a/SqlSugar/SqlSugarClient.cs b/SqlSugar/SqlSugarClient.cs index 526be0e9a..ce166872a 100644 --- a/SqlSugar/SqlSugarClient.cs +++ b/SqlSugar/SqlSugarClient.cs @@ -126,9 +126,9 @@ namespace SqlSugar /// /// Lambda Query operation /// - public virtual ISugarQueryable Queryable(string tableName,string shortName,string widthString=null) + public virtual ISugarQueryable Queryable(string tableName,string shortName,string widthString=null) { - var queryable = Queryable(); + var queryable = Queryable(); queryable.SqlBuilder.LambadaQueryBuilder.EntityName = tableName; queryable.SqlBuilder.LambadaQueryBuilder.TableShortName = shortName; queryable.SqlBuilder.LambadaQueryBuilder.TableWithString = widthString;