From faf90089e64d9b1939e47e4ac02206435648f0b9 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Tue, 6 Jun 2023 18:22:58 +0800 Subject: [PATCH] Synchronization code --- .../SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs | 2 +- .../SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs index efb7547cd..e1e77f4e6 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs @@ -643,7 +643,7 @@ namespace SqlSugar if (this.QueryBuilder.Includes != null) { var managers = (this.QueryBuilder.Includes as List); - if (IsSelectNavQuery()) + if (this.QueryBuilder.AppendNavInfo?.AppendProperties?.Any()==true) { if (result.HasValue()) { diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs index 021b2a970..2b57bc4e8 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs @@ -1252,6 +1252,7 @@ namespace SqlSugar var index = QueryBuilder.WhereIndex + 1; var result = this.Context.Queryable().AS(SqlBuilder.GetPackTable(sqlobj.Key, "MergeTable")).AddParameters(sqlobj.Value).Select("*").With(SqlWith.Null); result.QueryBuilder.WhereIndex = index; + result.QueryBuilder.NoCheckInclude = true; result.QueryBuilder.LambdaExpressions.ParameterIndex = QueryBuilder.LambdaExpressions.ParameterIndex++; result.QueryBuilder.LambdaExpressions.Index = QueryBuilder.LambdaExpressions.Index++; if (this.Context.CurrentConnectionConfig.DbType == DbType.Oracle)