From 7137b5c2be306ddf45aa3e096be61a00268010c1 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Mon, 29 Jan 2018 17:21:07 +0800 Subject: [PATCH] - --- Src/Asp.Net/SqlServerTest/Demos/8_JoinSql.cs | 4 ++-- Src/Asp.Net/SqlSugar/Infrastructure/ContextMethods.cs | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Src/Asp.Net/SqlServerTest/Demos/8_JoinSql.cs b/Src/Asp.Net/SqlServerTest/Demos/8_JoinSql.cs index 18c808b39..b83d8dc46 100644 --- a/Src/Asp.Net/SqlServerTest/Demos/8_JoinSql.cs +++ b/Src/Asp.Net/SqlServerTest/Demos/8_JoinSql.cs @@ -48,8 +48,8 @@ namespace OrmTest.Demo conModels.Add(new ConditionalCollections() { ConditionalList=new List>()// (id=1 or id=2 and id=1) { - new KeyValuePair( WhereType.Or ,new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "1" }), - new KeyValuePair (WhereType.And,new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "2" }), + new KeyValuePair( WhereType.And ,new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "1" }), + new KeyValuePair (WhereType.Or,new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "2" }), new KeyValuePair ( WhereType.And,new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "2" }) } }); diff --git a/Src/Asp.Net/SqlSugar/Infrastructure/ContextMethods.cs b/Src/Asp.Net/SqlSugar/Infrastructure/ContextMethods.cs index 596f7a3ed..bb6635a0c 100644 --- a/Src/Asp.Net/SqlSugar/Infrastructure/ContextMethods.cs +++ b/Src/Asp.Net/SqlSugar/Infrastructure/ContextMethods.cs @@ -396,11 +396,15 @@ namespace SqlSugar var isLast = index == (item.ConditionalList.Count - 1); if (isFirst) { - builder.Append(" AND( "); + builder.AppendFormat(" {0} ( ", con.Key.ToString().ToUpper()); } List conModels = new List(); conModels.Add(con.Value); var childSqlInfo = ConditionalModelToSql(conModels,1000*(1+index)); + if (!isFirst) { + + builder.AppendFormat(" {0} ", con.Key.ToString().ToUpper()); + } builder.Append(childSqlInfo.Key); parameters.AddRange(childSqlInfo.Value); if (isLast) @@ -409,7 +413,6 @@ namespace SqlSugar } else { - builder.AppendFormat(" {0} ", con.Key.ToString().ToUpper()); } } }