diff --git a/Src/Asp.Net/SqlServerTest/UnitTest/UCustom012.cs b/Src/Asp.Net/SqlServerTest/UnitTest/UCustom012.cs index 4e44a72ba..3cda737eb 100644 --- a/Src/Asp.Net/SqlServerTest/UnitTest/UCustom012.cs +++ b/Src/Asp.Net/SqlServerTest/UnitTest/UCustom012.cs @@ -89,10 +89,10 @@ namespace OrmTest db.Insertable(new Tree1() { Id = 3, Name = "0102", ParentId = 1 }).ExecuteCommand(); db.Insertable(new Tree1() { Id = 4, Name = "02" }).ExecuteCommand(); db.Insertable(new Tree1() { Id = 5, Name = "0201", ParentId = 2 }).ExecuteCommand(); - db.Insertable(new Tree1() { Id = 6, Name = "020101", ParentId = 22 }).ExecuteCommand(); + db.Insertable(new Tree1() { Id = 6, Name = "020101", ParentId = 5 }).ExecuteCommand(); var list4=db.Queryable() - .Includes(it => it.Child,it=>it.Child) - .Includes(it => it.Parent,it=>it.Parent) + .Includes(it => it.Child,it=>it.Child,it=>it.Child) + .Includes(it => it.Parent,it=>it.Parent, it => it.Parent, it => it.Parent) .ToList(); //var json = db.Utilities.SerializeObject(list4); } diff --git a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/NavigatManager.cs b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/NavigatManager.cs index 1db47e3af..2b7406195 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/NavigatManager.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/NavigatManager.cs @@ -68,7 +68,7 @@ namespace SqlSugar } else if (i == 3) { - var currentList = _preList; + var currentList = _preList.Where(it => it != null).ToList(); if (RootList == null || currentList.Count == 0) return; var memberExpression = ((_preExpressionList.Last() as LambdaExpression).Body as MemberExpression); var navObjectName = memberExpression.Member.Name; @@ -85,7 +85,7 @@ namespace SqlSugar list = currentList.Select(it => (it.GetType().GetProperty(navObjectName).GetValue(it))).ToList(); } ExecuteByLay(item, list, SelectR3); - _preList = list; + _preList = list.ToList(); } _preExpressionList.Add(item); }