From ccfd52d223b17eb6f4c30cc69f4c3abad6105e1a Mon Sep 17 00:00:00 2001 From: skx <610262374@qq.com> Date: Sun, 15 Nov 2020 12:56:24 +0800 Subject: [PATCH] code optimization --- .../ResolveItems/BaseResolve.cs | 40 +++++++++++-------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve.cs b/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve.cs index bf76f3715..7b3a254d0 100644 --- a/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve.cs +++ b/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve.cs @@ -442,22 +442,7 @@ namespace SqlSugar } else { - var propertyName = property.Name; - var dbColumnName = propertyName; - var mappingInfo = this.Context.MappingColumns.FirstOrDefault(it => it.EntityName == item.Type.Name && it.PropertyName.Equals(propertyName, StringComparison.CurrentCultureIgnoreCase)); - if (mappingInfo.HasValue()) - { - dbColumnName = mappingInfo.DbColumnName; - } - asName = this.Context.GetTranslationText(item.Type.Name + "." + propertyName); - if (Context.IsJoin) - { - this.Context.Result.Append(Context.GetAsString(asName, dbColumnName, shortName.ObjToString())); - } - else - { - this.Context.Result.Append(Context.GetAsString(asName, dbColumnName)); - } + asName = GetAsName(item, shortName, property); } } } @@ -496,6 +481,29 @@ namespace SqlSugar } } + private string GetAsName(Expression item, object shortName, PropertyInfo property) + { + string asName; + var propertyName = property.Name; + var dbColumnName = propertyName; + var mappingInfo = this.Context.MappingColumns.FirstOrDefault(it => it.EntityName == item.Type.Name && it.PropertyName.Equals(propertyName, StringComparison.CurrentCultureIgnoreCase)); + if (mappingInfo.HasValue()) + { + dbColumnName = mappingInfo.DbColumnName; + } + asName = this.Context.GetTranslationText(item.Type.Name + "." + propertyName); + if (Context.IsJoin) + { + this.Context.Result.Append(Context.GetAsString(asName, dbColumnName, shortName.ObjToString())); + } + else + { + this.Context.Result.Append(Context.GetAsString(asName, dbColumnName)); + } + + return asName; + } + private static bool IsBoolValue(Expression item) { return item.Type == UtilConstants.BoolType &&