diff --git a/Src/Asp.Net/SqlSugar/SqlSugar.nuspec b/Src/Asp.Net/SqlSugar/SqlSugar.nuspec index 2f06d679b..be4256d9d 100644 --- a/Src/Asp.Net/SqlSugar/SqlSugar.nuspec +++ b/Src/Asp.Net/SqlSugar/SqlSugar.nuspec @@ -2,7 +2,7 @@ sqlSugar - 4.9.8 + 4.9.8.1 SqlSugar .Net Framework 4.0+ ORM sun kaixuan landa diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs index 4498aa330..886543d59 100644 --- a/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs +++ b/Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs @@ -146,7 +146,7 @@ namespace SqlSugar /// public ISugarQueryable WhereClass(ClassType whereClass, bool ignoreDefaultValue = false) where ClassType : class, new() { - return WhereClass(new List() { whereClass },ignoreDefaultValue); + return WhereClass(new List() { whereClass }, ignoreDefaultValue); } /// /// if a property that is not empty is a condition @@ -168,9 +168,9 @@ namespace SqlSugar var value = column.PropertyInfo.GetValue(item, null); WhereType WhereType = WhereType.And; - var isNotNull = ignoreDefaultValue == false&&value != null ; - var isNotNullAndDefault = ignoreDefaultValue&& value!=null && value.ObjToString() != UtilMethods.DefaultForType(column.PropertyInfo.PropertyType).ObjToString(); - if (isNotNull||isNotNullAndDefault) + var isNotNull = ignoreDefaultValue == false && value != null; + var isNotNullAndDefault = ignoreDefaultValue && value != null && value.ObjToString() != UtilMethods.DefaultForType(column.PropertyInfo.PropertyType).ObjToString(); + if (isNotNull || isNotNullAndDefault) { if (cons.ConditionalList == null) { @@ -271,7 +271,7 @@ namespace SqlSugar Where(SqlBuilder.SqlFalse); return this; } - if (pkValues.Length == 1 && pkValues.First().GetType().FullName.IsCollectionsList()|| pkValues.First() is IEnumerable) + if (pkValues.Length == 1 && pkValues.First().GetType().FullName.IsCollectionsList() || (pkValues.First() is IEnumerable && pkValues.First().GetType() != UtilConstants.StringType)) { var newValues = new List(); foreach (var item in pkValues.First() as IEnumerable) @@ -2721,9 +2721,9 @@ namespace SqlSugar /// /// /// - public new ISugarQueryable WhereClass(ClassType whereClass, bool ignoreDefaultValue = false) where ClassType : class, new() + public new ISugarQueryable WhereClass(ClassType whereClass, bool ignoreDefaultValue = false) where ClassType : class, new() { - base.WhereClass(whereClass, ignoreDefaultValue); + base.WhereClass(whereClass, ignoreDefaultValue); return this; } /// @@ -2731,7 +2731,7 @@ namespace SqlSugar /// /// /// - public new ISugarQueryable WhereClass(List whereClassTypes, bool ignoreDefaultValue = false) where ClassType : class, new() + public new ISugarQueryable WhereClass(List whereClassTypes, bool ignoreDefaultValue = false) where ClassType : class, new() { base.WhereClass(whereClassTypes, ignoreDefaultValue); @@ -3074,7 +3074,7 @@ namespace SqlSugar /// /// /// - public new ISugarQueryable WhereClass(ClassType whereClass, bool ignoreDefaultValue = false) where ClassType : class, new() + public new ISugarQueryable WhereClass(ClassType whereClass, bool ignoreDefaultValue = false) where ClassType : class, new() { base.WhereClass(whereClass, ignoreDefaultValue); return this; @@ -3457,7 +3457,7 @@ namespace SqlSugar /// /// /// - public new ISugarQueryable WhereClass(ClassType whereClass, bool ignoreDefaultValue = false) where ClassType : class, new() + public new ISugarQueryable WhereClass(ClassType whereClass, bool ignoreDefaultValue = false) where ClassType : class, new() { base.WhereClass(whereClass, ignoreDefaultValue); return this; @@ -3467,7 +3467,7 @@ namespace SqlSugar /// /// /// - public new ISugarQueryable WhereClass(List whereClassTypes, bool ignoreDefaultValue = false) where ClassType : class, new() + public new ISugarQueryable WhereClass(List whereClassTypes, bool ignoreDefaultValue = false) where ClassType : class, new() { base.WhereClass(whereClassTypes, ignoreDefaultValue); diff --git a/Src/Asp.NetCore2/SqlSeverTest/SqliteTest/DataBase/SqlSugar4xTest.sqlite b/Src/Asp.NetCore2/SqlSeverTest/SqliteTest/DataBase/SqlSugar4xTest.sqlite index 837bd4e67..4eb38be8d 100644 Binary files a/Src/Asp.NetCore2/SqlSeverTest/SqliteTest/DataBase/SqlSugar4xTest.sqlite and b/Src/Asp.NetCore2/SqlSeverTest/SqliteTest/DataBase/SqlSugar4xTest.sqlite differ