From 76c239f45f9ad5272f57642daafd31da7416a1dc Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Sat, 6 Jan 2024 22:07:23 +0800 Subject: [PATCH] Update IncludeLeftJoin --- .../Abstract/QueryableProvider/QueryableProvider.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs index 74c775355..72b015017 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs @@ -40,7 +40,7 @@ namespace SqlSugar var shortName = $"pnv_{navObjectName}"; var mainShortName = memberExpression.Expression.ToString(); this.QueryBuilder.TableShortName = mainShortName; - var onWhere = $"{shortName}.{navPkColumn.DbColumnName}={mainShortName}.{navColumn.DbColumnName}"; + var onWhere = $"{SqlBuilder.GetTranslationColumnName(shortName)}.{SqlBuilder.GetTranslationColumnName(navPkColumn.DbColumnName)}={SqlBuilder.GetTranslationColumnName(mainShortName)}.{SqlBuilder.GetTranslationColumnName(navColumn.DbColumnName)}"; UtilMethods.IsNullReturnNew(this.Context.TempItems); this.AddJoinInfo(GetTableName(navEntityInfo, navEntityInfo.DbTableName), shortName, onWhere, JoinType.Left); this.QueryBuilder.JoinQueryInfos.Last().EntityType = navEntityInfo.Type; @@ -56,7 +56,7 @@ namespace SqlSugar var shortName = $"pnv_{navObjectName}"; var mainShortName = memberExpression.Expression.ToString(); this.QueryBuilder.TableShortName = mainShortName; - var onWhere = $"{shortName}.{navPkColumn.DbColumnName}={mainShortName}.{navColumn.DbColumnName}"; + var onWhere = $"{SqlBuilder.GetTranslationColumnName(shortName)}.{SqlBuilder.GetTranslationColumnName(navPkColumn.DbColumnName)}={SqlBuilder.GetTranslationColumnName(mainShortName)}.{SqlBuilder.GetTranslationColumnName(navColumn.DbColumnName)}"; UtilMethods.IsNullReturnNew(this.Context.TempItems); this.AddJoinInfo(GetTableName(navEntityInfo, navEntityInfo.DbTableName), shortName, onWhere, JoinType.Inner); this.QueryBuilder.JoinQueryInfos.Last().EntityType = navEntityInfo.Type; @@ -72,7 +72,7 @@ namespace SqlSugar var shortName = $"pnv_{navObjectName}"; var mainShortName = memberExpression.Expression.ToString(); this.QueryBuilder.TableShortName = mainShortName; - var onWhere = $"{shortName}.{navPkColumn.DbColumnName}={mainShortName}.{navColumn.DbColumnName}"; + var onWhere = $"{SqlBuilder.GetTranslationColumnName(shortName)}.{SqlBuilder.GetTranslationColumnName(navPkColumn.DbColumnName)}={SqlBuilder.GetTranslationColumnName(mainShortName)}.{SqlBuilder.GetTranslationColumnName(navColumn.DbColumnName)}"; UtilMethods.IsNullReturnNew(this.Context.TempItems); this.AddJoinInfo(GetTableName(navEntityInfo, navEntityInfo.DbTableName), shortName, onWhere, JoinType.Full); this.QueryBuilder.JoinQueryInfos.Last().EntityType = navEntityInfo.Type; @@ -88,7 +88,7 @@ namespace SqlSugar var shortName = $"pnv_{navObjectName}"; var mainShortName = memberExpression.Expression.ToString(); this.QueryBuilder.TableShortName = mainShortName; - var onWhere = $"{shortName}.{navPkColumn.DbColumnName}={mainShortName}.{navColumn.DbColumnName}"; + var onWhere = $"{SqlBuilder.GetTranslationColumnName(shortName)}.{SqlBuilder.GetTranslationColumnName(navPkColumn.DbColumnName)}={SqlBuilder.GetTranslationColumnName(mainShortName)}.{SqlBuilder.GetTranslationColumnName(navColumn.DbColumnName)}"; UtilMethods.IsNullReturnNew(this.Context.TempItems); this.AddJoinInfo(GetTableName(navEntityInfo, navEntityInfo.DbTableName), shortName, onWhere, JoinType.Right); this.QueryBuilder.JoinQueryInfos.Last().EntityType = navEntityInfo.Type;