diff --git a/Src/Asp.Net/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs b/Src/Asp.Net/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs index 1c1519acb..3db043bd0 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs @@ -309,7 +309,7 @@ namespace SqlSugar column.ColumnDescription = sugarColumn.ColumnDescription; } } - if (column.ColumnDescription.IsNullOrEmpty()) column.ColumnDescription = GetPropertyAnnotation(result.Type, column.DbColumnName); + if (column.ColumnDescription.IsNullOrEmpty()) column.ColumnDescription = GetPropertyAnnotation(result.Type, column.PropertyName); if (this.Context.MappingColumns.HasValue()) { var golbalMappingInfo = this.Context.MappingColumns.FirstOrDefault(it => it.EntityName.Equals(result.EntityName, StringComparison.CurrentCultureIgnoreCase) && it.PropertyName == column.PropertyName); diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs index dd22d3e42..164972827 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs @@ -532,13 +532,13 @@ namespace SqlSugar FieldValue = value.ObjToStringNew(), CSharpTypeName = column.PropertyInfo.PropertyType.Name }); - if (this.Context.CurrentConnectionConfig.DbType == DbType.PostgreSQL) - { - data.Value.FieldValueConvertFunc = it => - { - return UtilMethods.ChangeType2(it, value.GetType()); - }; - } + //if (this.Context.CurrentConnectionConfig.DbType == DbType.PostgreSQL) + //{ + // data.Value.FieldValueConvertFunc = it => + // { + // return UtilMethods.ChangeType2(it, value.GetType()); + // }; + //} cons.ConditionalList.Add(data); } if (cons.HasValue()) diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/UpdateBuilder.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/UpdateBuilder.cs index e75533e05..d59ed8765 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/UpdateBuilder.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/UpdateBuilder.cs @@ -159,7 +159,7 @@ namespace SqlSugar DbColumnInfoList = DbColumnInfoList.Where(it => { if (it.Value.ObjToString()=="0" && it.PropertyType.IsEnum) { - return it.Value.ObjToInt() != UtilMethods.DefaultForType(it.PropertyType).ObjToInt(); + return it.Value.ObjToLong() != UtilMethods.DefaultForType(it.PropertyType).ObjToLong(); } else { diff --git a/Src/Asp.NetCore2/SqlSugar/Utilities/UtilConvert.cs b/Src/Asp.NetCore2/SqlSugar/Utilities/UtilConvert.cs index a645ee55b..e70608361 100644 --- a/Src/Asp.NetCore2/SqlSugar/Utilities/UtilConvert.cs +++ b/Src/Asp.NetCore2/SqlSugar/Utilities/UtilConvert.cs @@ -13,7 +13,7 @@ namespace SqlSugar if (thisValue == null) return 0; if (thisValue is Enum) { - return (int)thisValue; + return Convert.ToInt32(thisValue); } if (thisValue != null && thisValue != DBNull.Value && int.TryParse(thisValue.ToString(), out reval)) { @@ -22,6 +22,21 @@ namespace SqlSugar return reval; } + public static long ObjToLong(this object thisValue) + { + long reval = 0; + if (thisValue == null) return 0; + if (thisValue is Enum) + { + return Convert.ToInt64(thisValue); + } + if (thisValue != null && thisValue != DBNull.Value && long.TryParse(thisValue.ToString(), out reval)) + { + return reval; + } + return reval; + } + public static int ObjToInt(this object thisValue, int errorValue) { int reval = 0;