From 36adba37aeb04f48f31ff93d2acfcaf03c775cee Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Sat, 21 Oct 2017 16:06:12 +0800 Subject: [PATCH] - --- .../EntityMaintenance/EntityMaintenance.cs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Src/Asp.Net/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs b/Src/Asp.Net/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs index 95b07d80b..3ae9da45b 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/EntityMaintenance/EntityMaintenance.cs @@ -76,7 +76,7 @@ namespace SqlSugar } public string GetDbColumnName(string propertyName) { - var isAny=this.GetEntityInfo().Columns.Any(it => it.PropertyName.Equals(propertyName, StringComparison.CurrentCultureIgnoreCase)); + var isAny = this.GetEntityInfo().Columns.Any(it => it.PropertyName.Equals(propertyName, StringComparison.CurrentCultureIgnoreCase)); Check.Exception(!isAny, "Property " + propertyName + " is Invalid"); var typeName = typeof(T).Name; if (this.Context.MappingColumns == null || this.Context.MappingColumns.Count == 0) return propertyName; @@ -102,7 +102,7 @@ namespace SqlSugar return typeof(T).GetProperties().First(it => it.Name == propertyName); } #region Primary key - private static void SetColumns(EntityInfo result) + private void SetColumns(EntityInfo result) { foreach (var property in result.Type.GetProperties()) { @@ -141,6 +141,18 @@ namespace SqlSugar column.IsIgnore = true; } } + if (this.Context.MappingColumns.HasValue()) + { + var golbalMappingInfo = this.Context.MappingColumns.FirstOrDefault(it => it.EntityName.Equals(result.EntityName, StringComparison.CurrentCultureIgnoreCase) && it.PropertyName == column.PropertyName); + if (golbalMappingInfo != null) + column.DbColumnName = golbalMappingInfo.DbColumnName; + } + if (this.Context.IgnoreColumns.HasValue()) + { + var golbalMappingInfo = this.Context.IgnoreColumns.FirstOrDefault(it => it.EntityName.Equals(result.EntityName, StringComparison.CurrentCultureIgnoreCase) && it.PropertyName == column.PropertyName); + if (golbalMappingInfo != null) + column.IsIgnore = true; + } result.Columns.Add(column); } }