Update ConditionalModelToSql

Src/Asp.Net/SqlServerTest/Demos/8_JoinSql.cs

@@ -37,13 +37,22 @@ namespace OrmTest.Demo
         private static void ConditionalModel()
         {
             var db = GetInstance();
-            List<ConditionalModel> conModels = new List<ConditionalModel>();
+            List<IConditionalModel> conModels = new List<IConditionalModel>();
-            conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "1" });
+            conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1
-            conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Like, FieldValue = "1" });
+            conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Like, FieldValue = "1" });// id like '%1%'
             conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.IsNullOrEmpty });
             conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.In,FieldValue="1,2,3" });
             conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.NotIn, FieldValue = "1,2,3" });
             conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.NoEqual, FieldValue = "1,2,3" });
+            conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.IsNot,FieldValue=null});// id is not null
+
+            conModels.Add(new ConditionalCollections() { ConditionalList=new List<KeyValuePair<WhereType, SqlSugar.ConditionalModel>>()//  (id=1 or id=2 and id=1)
+            {
+                new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or ,new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "1" }),
+                new  KeyValuePair<WhereType, ConditionalModel> (WhereType.And,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();
         }
 

Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs

@@ -122,7 +122,7 @@ namespace SqlSugar
             return this;
         }
 
-        public virtual ISugarQueryable<T> Where(List<ConditionalModel> conditionalModels)
+        public virtual ISugarQueryable<T> Where(List<IConditionalModel> conditionalModels)
         {
             if (conditionalModels.IsNullOrEmpty()) return this;
             var sqlObj = this.Context.Utilities.ConditionalModelToSql(conditionalModels);
@@ -1240,7 +1240,7 @@ namespace SqlSugar
             Where<T>(whereString, whereObj);
             return this;
         }
-        public new ISugarQueryable<T, T2> Where(List<ConditionalModel> conditionalModels)
+        public new ISugarQueryable<T, T2> Where(List<IConditionalModel> conditionalModels)
         {
             base.Where(conditionalModels);
             return this;
@@ -1567,7 +1567,7 @@ namespace SqlSugar
             _Where(expression);
             return this;
         }
-        public new ISugarQueryable<T, T2, T3> Where(List<ConditionalModel> conditionalModels)
+        public new ISugarQueryable<T, T2, T3> Where(List<IConditionalModel> conditionalModels)
         {
             base.Where(conditionalModels);
             return this;
@@ -1749,7 +1749,7 @@ namespace SqlSugar
             _Where(expression);
             return this;
         }
-        public new ISugarQueryable<T, T2, T3, T4> Where(List<ConditionalModel> conditionalModels)
+        public new ISugarQueryable<T, T2, T3, T4> Where(List<IConditionalModel> conditionalModels)
         {
             base.Where(conditionalModels);
             return this;
@@ -2063,7 +2063,7 @@ namespace SqlSugar
             _Where(expression);
             return this;
         }
-        public new ISugarQueryable<T, T2, T3, T4, T5> Where(List<ConditionalModel> conditionalModels)
+        public new ISugarQueryable<T, T2, T3, T4, T5> Where(List<IConditionalModel> conditionalModels)
         {
             base.Where(conditionalModels);
             return this;
@@ -2380,7 +2380,7 @@ namespace SqlSugar
             _Where(expression);
             return this;
         }
-        public new ISugarQueryable<T, T2, T3, T4, T5, T6> Where(List<ConditionalModel> conditionalModels)
+        public new ISugarQueryable<T, T2, T3, T4, T5, T6> Where(List<IConditionalModel> conditionalModels)
         {
             base.Where(conditionalModels);
             return this;
@@ -2687,7 +2687,7 @@ namespace SqlSugar
             _Where(expression);
             return this;
         }
-        public new ISugarQueryable<T, T2, T3, T4, T5, T6, T7> Where(List<ConditionalModel> conditionalModels)
+        public new ISugarQueryable<T, T2, T3, T4, T5, T6, T7> Where(List<IConditionalModel> conditionalModels)
         {
             base.Where(conditionalModels);
             return this;
@@ -3021,7 +3021,7 @@ namespace SqlSugar
             _Where(expression);
             return this;
         }
-        public new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8> Where(List<ConditionalModel> conditionalModels)
+        public new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8> Where(List<IConditionalModel> conditionalModels)
         {
             base.Where(conditionalModels);
             return this;
@@ -3387,7 +3387,7 @@ namespace SqlSugar
                 _Where(expression);
             return this;
         }
-        public new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9> Where(List<ConditionalModel> conditionalModels)
+        public new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9> Where(List<IConditionalModel> conditionalModels)
         {
             base.Where(conditionalModels);
             return this;
@@ -3765,7 +3765,7 @@ namespace SqlSugar
             _Where(expression);
             return this;
         }
-        public new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10> Where(List<ConditionalModel> conditionalModels)
+        public new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10> Where(List<IConditionalModel> conditionalModels)
         {
             base.Where(conditionalModels);
             return this;
@@ -4179,7 +4179,7 @@ namespace SqlSugar
                 _Where(expression);
             return this;
         }
-        public new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Where(List<ConditionalModel> conditionalModels)
+        public new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Where(List<IConditionalModel> conditionalModels)
         {
             base.Where(conditionalModels);
             return this;
@@ -4605,7 +4605,7 @@ namespace SqlSugar
             _Where(expression);
             return this;
         }
-        public new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Where(List<ConditionalModel> conditionalModels)
+        public new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Where(List<IConditionalModel> conditionalModels)
         {
             base.Where(conditionalModels);
             return this;

Src/Asp.Net/SqlSugar/Entities/ConditionalModel.cs

@@ -5,7 +5,15 @@ using System.Text;
 
 namespace SqlSugar
 {
-    public class ConditionalModel
+    public interface IConditionalModel {
+
+    }
+    public class ConditionalCollections : IConditionalModel
+    {
+         public List<KeyValuePair<WhereType, ConditionalModel>> ConditionalList { get; set; }
+    }
+ 
+    public class ConditionalModel: IConditionalModel
     {
         public ConditionalModel()
         {

Src/Asp.Net/SqlSugar/Enum/ConditionalType.cs

@@ -18,6 +18,7 @@ namespace SqlSugar
         LikeLeft=8,
         LikeRight=9,
         NoEqual=10,
-        IsNullOrEmpty=11
+        IsNullOrEmpty=11,
+        IsNot=12
     }
 }

Src/Asp.Net/SqlSugar/Enum/WhereType.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace SqlSugar
+{
+    public enum WhereType
+    {
+        And=0,
+        Or=1
+    }
+}

Src/Asp.Net/SqlSugar/Infrastructure/ContextMethods.cs

@@ -160,10 +160,12 @@ namespace SqlSugar
         {
             Dictionary<string, object> result = new Dictionary<string, object>();
             var type = item.PropertyType;
-            if (UtilConstants.SugarType == type) {
+            if (UtilConstants.SugarType == type)
+            {
                 return result;
             }
-            if (type.FullName.IsCollectionsList()) {
+            if (type.FullName.IsCollectionsList())
+            {
                 return null;
             }
             var classProperties = type.GetProperties().ToList();
@@ -295,16 +297,22 @@ namespace SqlSugar
         #endregion
 
         #region Query
-        public KeyValuePair<string, SugarParameter[]> ConditionalModelToSql(List<ConditionalModel> models)
+        public KeyValuePair<string, SugarParameter[]> ConditionalModelToSql(List<IConditionalModel> models,int beginIndex=0)
         {
             if (models.IsNullOrEmpty()) return new KeyValuePair<string, SugarParameter[]>();
             StringBuilder builder = new StringBuilder();
             List<SugarParameter> parameters = new List<SugarParameter>();
             var sqlBuilder = InstanceFactory.GetSqlbuilder(this.Context.CurrentConnectionConfig);
-            foreach (var item in models)
+            foreach (var model in models)
             {
-                var index = models.IndexOf(item);
+                if (model is ConditionalModel)
+                {
+                    var item = model as ConditionalModel;
+                    var index = models.IndexOf(item)+ beginIndex;
                     var type = index == 0 ? "" : "AND";
+                    if (beginIndex > 0) {
+                        type = null;
+                    }
                     string temp = " {0} {1} {2} {3}  ";
                     string parameterName = string.Format("{0}Conditional{1}{2}", sqlBuilder.SqlParameterKeyWord, item.FieldName, index);
                     switch (item.ConditionalType)
@@ -361,10 +369,52 @@ namespace SqlSugar
                             builder.AppendFormat("{0} ({1}) OR ({2}) ", type, item.FieldName.ToSqlFilter() + " IS NULL ", item.FieldName.ToSqlFilter() + " = '' ");
                             parameters.Add(new SugarParameter(parameterName, item.FieldValue));
                             break;
+                        case ConditionalType.IsNot:
+                            if (item.FieldValue == null)
+                            {
+                                builder.AppendFormat(temp, type, item.FieldName.ToSqlFilter(), " IS NOT ", "NULL");
+                            }
+                            else
+                            {
+                                builder.AppendFormat(temp, type, item.FieldName.ToSqlFilter(), "<>", parameterName);
+                                parameters.Add(new SugarParameter(parameterName, item.FieldValue));
+                            }
+                            break;
                         default:
                             break;
                     }
                 }
+                else
+                {
+                    var item = model as ConditionalCollections;
+                    if (item != null)
+                    {
+                        foreach (var con in item.ConditionalList)
+                        {
+                            var index = item.ConditionalList.IndexOf(con);
+                            var isFirst = index == 0;
+                            var isLast = index == (item.ConditionalList.Count - 1);
+                            if (isFirst)
+                            {
+                                builder.Append(" AND( ");
+                            }
+                            List<IConditionalModel> conModels = new List<IConditionalModel>();
+                            conModels.Add(con.Value);
+                            var childSqlInfo = ConditionalModelToSql(conModels,1000*(1+index));
+                            builder.Append(childSqlInfo.Key);
+                            parameters.AddRange(childSqlInfo.Value);
+                            if (isLast)
+                            {
+                                builder.Append(" ) ");
+                            }
+                            else {
+
+                                builder.AppendFormat(" {0} ", con.Key.ToString().ToUpper());
+                            }
+                        }
+                    }
+                }
+            }
             return new KeyValuePair<string, SugarParameter[]>(builder.ToString(), parameters.ToArray());
         }
         #endregion

Src/Asp.Net/SqlSugar/Interface/IContextMethods.cs

@@ -23,7 +23,7 @@ namespace SqlSugar
         void RemoveCacheAll();
         void RemoveCacheAll<T>();
         void RemoveCache<T>(string key);
-        KeyValuePair<string, SugarParameter[]> ConditionalModelToSql(List<ConditionalModel> models);
+        KeyValuePair<string, SugarParameter[]> ConditionalModelToSql(List<IConditionalModel> models,int beginIndex=0);
 
     }
 }

Src/Asp.Net/SqlSugar/Interface/IQueryable.cs

@@ -26,7 +26,7 @@ namespace SqlSugar
 
         ISugarQueryable<T> Where(Expression<Func<T, bool>> expression);
         ISugarQueryable<T> Where(string whereString, object whereObj = null);
-        ISugarQueryable<T> Where(List<ConditionalModel> conditionalModels);
+        ISugarQueryable<T> Where(List<IConditionalModel> conditionalModels);
 
         ISugarQueryable<T> Having(Expression<Func<T, bool>> expression);
         ISugarQueryable<T> Having(string whereString, object whereObj = null);
@@ -132,7 +132,7 @@ namespace SqlSugar
         #region Where
         new ISugarQueryable<T, T2> Where(Expression<Func<T, bool>> expression);
         ISugarQueryable<T, T2> Where(Expression<Func<T, T2, bool>> expression);
-        new ISugarQueryable<T, T2> Where(List<ConditionalModel> conditionalModels);
+        new ISugarQueryable<T, T2> Where(List<IConditionalModel> conditionalModels);
 
         new ISugarQueryable<T, T2> WhereIF(bool isWhere, Expression<Func<T, bool>> expression);
         ISugarQueryable<T, T2> WhereIF(bool isWhere, Expression<Func<T, T2, bool>> expression);
@@ -194,7 +194,7 @@ namespace SqlSugar
         new ISugarQueryable<T, T2, T3> Where(Expression<Func<T, bool>> expression);
         ISugarQueryable<T, T2, T3> Where(Expression<Func<T, T2, bool>> expression);
         ISugarQueryable<T, T2, T3> Where(Expression<Func<T, T2, T3, bool>> expression);
-        new ISugarQueryable<T, T2, T3> Where(List<ConditionalModel> conditionalModels);
+        new ISugarQueryable<T, T2, T3> Where(List<IConditionalModel> conditionalModels);
 
         new ISugarQueryable<T, T2, T3> WhereIF(bool isWhere, Expression<Func<T, bool>> expression);
         ISugarQueryable<T, T2, T3> WhereIF(bool isWhere, Expression<Func<T, T2, bool>> expression);
@@ -262,7 +262,7 @@ namespace SqlSugar
         ISugarQueryable<T, T2, T3, T4> Where(Expression<Func<T, T2, bool>> expression);
         ISugarQueryable<T, T2, T3, T4> Where(Expression<Func<T, T2, T3, bool>> expression);
         ISugarQueryable<T, T2, T3, T4> Where(Expression<Func<T, T2, T3, T4, bool>> expression);
-        new ISugarQueryable<T, T2, T3, T4> Where(List<ConditionalModel> conditionalModels);
+        new ISugarQueryable<T, T2, T3, T4> Where(List<IConditionalModel> conditionalModels);
 
         new ISugarQueryable<T, T2, T3, T4> WhereIF(bool isWhere, Expression<Func<T, bool>> expression);
         ISugarQueryable<T, T2, T3, T4> WhereIF(bool isWhere, Expression<Func<T, T2, bool>> expression);
@@ -337,7 +337,7 @@ namespace SqlSugar
         ISugarQueryable<T, T2, T3, T4, T5> Where(Expression<Func<T, T2, T3, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5> Where(Expression<Func<T, T2, T3, T4, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5> Where(Expression<Func<T, T2, T3, T4, T5, bool>> expression);
-        new ISugarQueryable<T, T2, T3, T4, T5> Where(List<ConditionalModel> conditionalModels);
+        new ISugarQueryable<T, T2, T3, T4, T5> Where(List<IConditionalModel> conditionalModels);
 
 
         new ISugarQueryable<T, T2, T3, T4, T5> WhereIF(bool isWhere, Expression<Func<T, bool>> expression);
@@ -414,7 +414,7 @@ namespace SqlSugar
         ISugarQueryable<T, T2, T3, T4, T5, T6> Where(Expression<Func<T, T2, T3, T4, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5, T6> Where(Expression<Func<T, T2, T3, T4, T5, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5, T6> Where(Expression<Func<T, T2, T3, T4, T5, T6, bool>> expression);
-        new ISugarQueryable<T, T2, T3, T4, T5, T6> Where(List<ConditionalModel> conditionalModels);
+        new ISugarQueryable<T, T2, T3, T4, T5, T6> Where(List<IConditionalModel> conditionalModels);
 
         new ISugarQueryable<T, T2, T3, T4, T5, T6> WhereIF(bool isWhere, Expression<Func<T, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5, T6> WhereIF(bool isWhere, Expression<Func<T, T2, bool>> expression);
@@ -489,7 +489,7 @@ namespace SqlSugar
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7> Where(Expression<Func<T, T2, T3, T4, T5, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7> Where(Expression<Func<T, T2, T3, T4, T5, T6, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7> Where(Expression<Func<T, T2, T3, T4, T5, T6, T7, bool>> expression);
-        new ISugarQueryable<T, T2, T3, T4, T5, T6, T7> Where(List<ConditionalModel> conditionalModels);
+        new ISugarQueryable<T, T2, T3, T4, T5, T6, T7> Where(List<IConditionalModel> conditionalModels);
 
         new ISugarQueryable<T, T2, T3, T4, T5, T6, T7> WhereIF(bool isWhere, Expression<Func<T, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7> WhereIF(bool isWhere, Expression<Func<T, T2, bool>> expression);
@@ -569,7 +569,7 @@ namespace SqlSugar
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8> Where(Expression<Func<T, T2, T3, T4, T5, T6, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8> Where(Expression<Func<T, T2, T3, T4, T5, T6, T7, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8> Where(Expression<Func<T, T2, T3, T4, T5, T6, T7, T8, bool>> expression);
-        new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8> Where(List<ConditionalModel> conditionalModels);
+        new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8> Where(List<IConditionalModel> conditionalModels);
 
         new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8> WhereIF(bool isWhere, Expression<Func<T, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8> WhereIF(bool isWhere, Expression<Func<T, T2, bool>> expression);
@@ -656,7 +656,7 @@ namespace SqlSugar
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9> Where(Expression<Func<T, T2, T3, T4, T5, T6, T7, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9> Where(Expression<Func<T, T2, T3, T4, T5, T6, T7, T8, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9> Where(Expression<Func<T, T2, T3, T4, T5, T6, T7, T8, T9, bool>> expression);
-        new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9> Where(List<ConditionalModel> conditionalModels);
+        new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9> Where(List<IConditionalModel> conditionalModels);
 
         new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9> WhereIF(bool isWhere, Expression<Func<T, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9> WhereIF(bool isWhere, Expression<Func<T, T2, bool>> expression);
@@ -746,7 +746,7 @@ namespace SqlSugar
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10> Where(Expression<Func<T, T2, T3, T4, T5, T6, T7, T8, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10> Where(Expression<Func<T, T2, T3, T4, T5, T6, T7, T8, T9, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10> Where(Expression<Func<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, bool>> expression);
-        new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10> Where(List<ConditionalModel> conditionalModels);
+        new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10> Where(List<IConditionalModel> conditionalModels);
 
         new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10> WhereIF(bool isWhere, Expression<Func<T, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10> WhereIF(bool isWhere, Expression<Func<T, T2, bool>> expression);
@@ -841,7 +841,7 @@ namespace SqlSugar
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Where(Expression<Func<T, T2, T3, T4, T5, T6, T7, T8, T9, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Where(Expression<Func<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Where(Expression<Func<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, bool>> expression);
-        new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Where(List<ConditionalModel> conditionalModels);
+        new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Where(List<IConditionalModel> conditionalModels);
 
         new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WhereIF(bool isWhere, Expression<Func<T, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> WhereIF(bool isWhere, Expression<Func<T, T2, bool>> expression);
@@ -941,7 +941,7 @@ namespace SqlSugar
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Where(Expression<Func<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Where(Expression<Func<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Where(Expression<Func<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, bool>> expression);
-        new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Where(List<ConditionalModel> conditionalModels);
+        new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Where(List<IConditionalModel> conditionalModels);
 
         new ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WhereIF(bool isWhere, Expression<Func<T, bool>> expression);
         ISugarQueryable<T, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> WhereIF(bool isWhere, Expression<Func<T, T2, bool>> expression);

Src/Asp.Net/SqlSugar/SqlSugar.csproj

@@ -81,6 +81,7 @@
     <Compile Include="Entities\SlaveConnectionConfig.cs" />
     <Compile Include="Enum\ConditionalType.cs" />
     <Compile Include="Enum\DbType.cs" />
+    <Compile Include="Enum\WhereType.cs" />
     <Compile Include="ExpressionsToSql\CaseWhen\CaseWhen.cs" />
     <Compile Include="ExpressionsToSql\CaseWhen\CaseWhenResolve.cs" />
     <Compile Include="ExpressionsToSql\DbMethods\SqlFuncExternal.cs" />