From 56f11463708d3b4b703bc8b676e091ad3a0e084f Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Fri, 29 Mar 2019 00:21:41 +0800
Subject: [PATCH] https://github.com/sunkaixuan/SqlSugar/issues/285 
 IConditionalModel

---
 Src/Asp.Net/SqlServerTest/Demos/8_JoinSql.cs          | 9 +++++++++
 Src/Asp.Net/SqlSugar/Infrastructure/ContextMethods.cs | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Src/Asp.Net/SqlServerTest/Demos/8_JoinSql.cs b/Src/Asp.Net/SqlServerTest/Demos/8_JoinSql.cs
index 490f11028..9aff48d3d 100644
--- a/Src/Asp.Net/SqlServerTest/Demos/8_JoinSql.cs
+++ b/Src/Asp.Net/SqlServerTest/Demos/8_JoinSql.cs
@@ -76,6 +76,15 @@ namespace OrmTest.Demo
                 new  KeyValuePair<WhereType, ConditionalModel> ( WhereType.And,new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "2" })
             }
             });
+            conModels.Add(new ConditionalCollections()
+            {
+                ConditionalList = new List<KeyValuePair<WhereType, SqlSugar.ConditionalModel>>()//  (id=1 or id=2 and id=1)
+            {
+                new  KeyValuePair<WhereType, ConditionalModel>( WhereType.And ,new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "1" }),
+                new  KeyValuePair<WhereType, ConditionalModel> (WhereType.Or,new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "2" }),
+                new  KeyValuePair<WhereType, ConditionalModel> ( WhereType.And,new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "2" })
+            }
+            });
             var student = db.Queryable<Student>().Where(conModels).ToList();
         }
 
diff --git a/Src/Asp.Net/SqlSugar/Infrastructure/ContextMethods.cs b/Src/Asp.Net/SqlSugar/Infrastructure/ContextMethods.cs
index adc0b23de..1132edcc3 100644
--- a/Src/Asp.Net/SqlSugar/Infrastructure/ContextMethods.cs
+++ b/Src/Asp.Net/SqlSugar/Infrastructure/ContextMethods.cs
@@ -466,7 +466,7 @@ namespace SqlSugar
                             }
                             List<IConditionalModel> conModels = new List<IConditionalModel>();
                             conModels.Add(con.Value);
-                            var childSqlInfo = ConditionalModelToSql(conModels, 1000 * (1 + index));
+                            var childSqlInfo = ConditionalModelToSql(conModels, 1000 * (1 + index)+ models.IndexOf(item));
                             if (!isFirst)
                             {