From b1e6adf50a6948b57bdadb690350ce407cb2b26d Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Mon, 25 Nov 2024 17:46:57 +0800 Subject: [PATCH] Update nav --- .../ResolveItems/OneToOneNavgateExpressionN.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/OneToOneNavgateExpressionN.cs b/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/OneToOneNavgateExpressionN.cs index 6ab97888f..340624937 100644 --- a/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/OneToOneNavgateExpressionN.cs +++ b/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/OneToOneNavgateExpressionN.cs @@ -47,6 +47,7 @@ namespace SqlSugar var memberInfo = this.items.Where(it => it.Type == 1).First(); var subInfos = this.items.Where(it => it.Type == 2).Reverse().ToList(); var formInfo = subInfos.First(); + var rootWhereSql = formInfo?.Nav?.WhereSql; var joinInfos = subInfos.Skip(1).ToList(); var i = 0; var masterShortName = formInfo.ThisEntityInfo.DbTableName + i; @@ -80,6 +81,10 @@ namespace SqlSugar } var selectProperyInfo = ExpressionTool.GetMemberName(memberInfo.Expression); var selectColumnInfo = memberInfo.ParentEntityInfo.Columns.First(it => it.PropertyName == selectProperyInfo); + if (rootWhereSql?.HasValue() == true) + { + queryable.Where(rootWhereSql); + } queryable.Select($" {ToShortName(lastShortName)}.{queryable.SqlBuilder.GetTranslationColumnName(selectColumnInfo.DbColumnName)}"); var last = subInfos.First(); var FirstPkColumn = last.ThisEntityInfo.Columns.FirstOrDefault(it => it.IsPrimarykey);