From be6bdff169cdbce881765eb4ea66209aa70bd5c2 Mon Sep 17 00:00:00 2001 From: skx <610262374@qq.com> Date: Sat, 5 Dec 2020 17:14:04 +0800 Subject: [PATCH] - --- Src/Asp.Net/SqlServerTest/Demo/Demo1_Queryable.cs | 11 +++++++++++ .../Abstract/SugarProvider/SqlSugarProvider.cs | 4 ++-- Src/Asp.Net/SqlSugar/Interface/ISqlSugarClient.cs | 4 ++-- Src/Asp.Net/SqlSugar/SqlSugarClient.cs | 4 ++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Src/Asp.Net/SqlServerTest/Demo/Demo1_Queryable.cs b/Src/Asp.Net/SqlServerTest/Demo/Demo1_Queryable.cs index eb0734f30..07e88fb72 100644 --- a/Src/Asp.Net/SqlServerTest/Demo/Demo1_Queryable.cs +++ b/Src/Asp.Net/SqlServerTest/Demo/Demo1_Queryable.cs @@ -251,6 +251,17 @@ namespace OrmTest db.Queryable().Where(it => it.Name.Contains("b")) ).ToList(); + + + var query4 = db.Queryable( + db.Queryable().Where(it => it.Name.Contains("a")), + db.Queryable().Where(it => it.CreateTime>DateTime.Now), + db.Queryable().Where(it => it.Name.Contains("b")), + JoinType.Left, (o, i, c) => o.Id==i.OrderId, + JoinType.Left,(o,i,c)=>o.CustomId==c.Id + + ).Select(o=>o).ToList(); + Console.WriteLine("#### Join Table End ####"); } diff --git a/Src/Asp.Net/SqlSugar/Abstract/SugarProvider/SqlSugarProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/SugarProvider/SqlSugarProvider.cs index c80074668..84dec3054 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/SugarProvider/SqlSugarProvider.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/SugarProvider/SqlSugarProvider.cs @@ -448,8 +448,8 @@ namespace SqlSugar public virtual ISugarQueryable Queryable( ISugarQueryable joinQueryable1, ISugarQueryable joinQueryable2, ISugarQueryable joinQueryable3, - JoinType joinType1, Expression> joinExpression1 , - JoinType joinType2 , Expression> joinExpression2 + JoinType joinType1, Expression> joinExpression1 , + JoinType joinType2 , Expression> joinExpression2 ) where T : class, new() where T2 : class, new() where T3 : class, new() { Check.Exception(joinQueryable1.QueryBuilder.Take != null || joinQueryable1.QueryBuilder.Skip != null || joinQueryable1.QueryBuilder.OrderByValue.HasValue(), "joinQueryable1 Cannot have 'Skip' 'ToPageList' 'Take' Or 'OrderBy'"); diff --git a/Src/Asp.Net/SqlSugar/Interface/ISqlSugarClient.cs b/Src/Asp.Net/SqlSugar/Interface/ISqlSugarClient.cs index c344d9c52..589d81116 100644 --- a/Src/Asp.Net/SqlSugar/Interface/ISqlSugarClient.cs +++ b/Src/Asp.Net/SqlSugar/Interface/ISqlSugarClient.cs @@ -104,8 +104,8 @@ namespace SqlSugar where T2 : class, new(); ISugarQueryable Queryable(ISugarQueryable joinQueryable1, ISugarQueryable joinQueryable2, ISugarQueryable joinQueryable3, - JoinType joinType1, Expression> joinExpression1, - JoinType joinType2, Expression> joinExpression2) + JoinType joinType1, Expression> joinExpression1, + JoinType joinType2, Expression> joinExpression2) where T: class, new() where T2 : class, new() where T3 : class, new(); diff --git a/Src/Asp.Net/SqlSugar/SqlSugarClient.cs b/Src/Asp.Net/SqlSugar/SqlSugarClient.cs index aa804ef40..8cee2c279 100644 --- a/Src/Asp.Net/SqlSugar/SqlSugarClient.cs +++ b/Src/Asp.Net/SqlSugar/SqlSugarClient.cs @@ -309,8 +309,8 @@ namespace SqlSugar public ISugarQueryable Queryable(ISugarQueryable joinQueryable1, ISugarQueryable joinQueryable2, ISugarQueryable joinQueryable3, - JoinType joinType1, Expression> joinExpression1, - JoinType joinType2, Expression> joinExpression2) + JoinType joinType1, Expression> joinExpression1, + JoinType joinType2, Expression> joinExpression2) where T : class, new() where T2 : class, new() where T3 : class, new()