From 0ca39be825413a2c18f65fa52b4de444454db658 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Tue, 14 Feb 2023 01:26:27 +0800 Subject: [PATCH] Bug: Subquery.ToList --- .../QueryableProvider/QueryableProvider.cs | 4 +--- .../Abstract/SqlBuilderProvider/QueryBuilder.cs | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs index 09607ac72..c3087b615 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs @@ -1051,9 +1051,7 @@ namespace SqlSugar var parameters = (expression as LambdaExpression).Parameters; var columnsResult = this.Context.EntityMaintenance.GetEntityInfo().Columns; sql = AppendSelect(this.EntityInfo.Columns,sql, parameters, columnsResult, 0); - var result= this.Select(sql); - result.QueryBuilder.SelectValue = expression; - return result; + return this.Select(sql); } public virtual ISugarQueryable Select() diff --git a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs index 22865bb37..048ded332 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs @@ -688,9 +688,10 @@ namespace SqlSugar } protected string SubToListMethod(string result) { + string oldResult = result; List names = new List(); var allShortName = new List(); - if (IsSingleSubToList()) + if (IsSingleSubToList()) { this.TableShortName = (SelectValue as LambdaExpression).Parameters[0].Name; } @@ -699,7 +700,7 @@ namespace SqlSugar { foreach (var item in this.JoinQueryInfos) { - allShortName.Add(this.Builder.SqlTranslationLeft + Builder.GetNoTranslationColumnName(item.ShortName.ObjToString().ToLower() ) + this.Builder.SqlTranslationRight + "."); + allShortName.Add(this.Builder.SqlTranslationLeft + Builder.GetNoTranslationColumnName(item.ShortName.ObjToString().ToLower()) + this.Builder.SqlTranslationRight + "."); } } else if (this.EasyJoinInfos != null && this.EasyJoinInfos.Any()) @@ -736,9 +737,13 @@ namespace SqlSugar this.AppendColumns = colums; } } - + if (HasAppText(oldResult)) + { + return oldResult; + } return result; } + #endregion #region Get SQL Partial @@ -1029,5 +1034,9 @@ namespace SqlSugar && this.SelectValue is Expression && this.IsSingle(); } + private static bool HasAppText(string result) + { + return result.HasValue() && result.Contains("app_ext_col_0"); + } } }