This commit is contained in:
sunkaixuan
2017-10-25 19:56:08 +08:00
parent 5664311f83
commit a6620ad975
2 changed files with 10 additions and 10 deletions

View File

@@ -262,11 +262,11 @@ namespace SqlSugar
++i; ++i;
} }
} }
protected string GetDbColumnName(string columns) private string GetDbColumnName(string propertyName)
{ {
if (!IsMappingColumns) if (!IsMappingColumns)
{ {
return columns; return propertyName;
} }
if (this.Context.MappingColumns.Any(it => it.EntityName.Equals(EntityInfo.EntityName, StringComparison.CurrentCultureIgnoreCase))) if (this.Context.MappingColumns.Any(it => it.EntityName.Equals(EntityInfo.EntityName, StringComparison.CurrentCultureIgnoreCase)))
{ {
@@ -274,12 +274,12 @@ namespace SqlSugar
} }
if (MappingColumnList == null || !MappingColumnList.Any()) if (MappingColumnList == null || !MappingColumnList.Any())
{ {
return columns; return propertyName;
} }
else else
{ {
var mappInfo = this.Context.MappingColumns.FirstOrDefault(it => it.EntityName == EntityInfo.EntityName && it.PropertyName.Equals(columns, StringComparison.CurrentCultureIgnoreCase)); var mappInfo = this.MappingColumnList.FirstOrDefault(it => it.PropertyName.Equals(propertyName, StringComparison.CurrentCultureIgnoreCase));
return mappInfo == null ? columns : mappInfo.DbColumnName; return mappInfo == null ? propertyName : mappInfo.DbColumnName;
} }
} }

View File

@@ -281,11 +281,11 @@ namespace SqlSugar
this.UpdateBuilder.Parameters.RemoveAll(it => this.UpdateBuilder.SetValues.Any(v => (SqlBuilder.SqlParameterKeyWord + SqlBuilder.GetNoTranslationColumnName(v.Key)) == it.ParameterName)); this.UpdateBuilder.Parameters.RemoveAll(it => this.UpdateBuilder.SetValues.Any(v => (SqlBuilder.SqlParameterKeyWord + SqlBuilder.GetNoTranslationColumnName(v.Key)) == it.ParameterName));
} }
} }
private string GetDbColumnName(string entityName) private string GetDbColumnName(string propertyName)
{ {
if (!IsMappingColumns) if (!IsMappingColumns)
{ {
return entityName; return propertyName;
} }
if (this.Context.MappingColumns.Any(it => it.EntityName.Equals(EntityInfo.EntityName, StringComparison.CurrentCultureIgnoreCase))) if (this.Context.MappingColumns.Any(it => it.EntityName.Equals(EntityInfo.EntityName, StringComparison.CurrentCultureIgnoreCase)))
{ {
@@ -293,12 +293,12 @@ namespace SqlSugar
} }
if (MappingColumnList == null || !MappingColumnList.Any()) if (MappingColumnList == null || !MappingColumnList.Any())
{ {
return entityName; return propertyName;
} }
else else
{ {
var mappInfo = this.Context.MappingColumns.FirstOrDefault(it => it.PropertyName.Equals(entityName, StringComparison.CurrentCultureIgnoreCase)); var mappInfo = this.MappingColumnList.FirstOrDefault(it => it.PropertyName.Equals(propertyName, StringComparison.CurrentCultureIgnoreCase));
return mappInfo == null ? entityName : mappInfo.DbColumnName; return mappInfo == null ? propertyName : mappInfo.DbColumnName;
} }
} }
private List<string> GetPrimaryKeys() private List<string> GetPrimaryKeys()