From ff0f5c687e557928b9c7d131ee21edb7a79646bb Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Wed, 26 Apr 2023 16:48:10 +0800
Subject: [PATCH] Synchronization code

---
 .../Abstract/QueryableProvider/QueryableExecuteSql.cs         | 4 ++--
 .../Abstract/QueryableProvider/QueryableExecuteSqlAsync.cs    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableExecuteSql.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableExecuteSql.cs
index 90f736200..285364c01 100644
--- a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableExecuteSql.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableExecuteSql.cs
@@ -335,12 +335,12 @@ namespace SqlSugar
             var entity = this.Context.EntityMaintenance.GetEntityInfo<T>();
             var pk = GetTreeKey(entity);
             var list = this.ToList();
-            return GetTreeRoot(childListExpression, parentIdExpression, pk, list, rootValue);
+            return GetTreeRoot(childListExpression, parentIdExpression, pk, list, rootValue)??new List<T>();
         }
         public  List<T> ToTree(Expression<Func<T, IEnumerable<object>>> childListExpression, Expression<Func<T, object>> parentIdExpression, object rootValue, object[] childIds)
         {
             var list =  this.ToList();
-            return TreeAndFilterIds(childListExpression, parentIdExpression, rootValue, childIds, ref list);
+            return TreeAndFilterIds(childListExpression, parentIdExpression, rootValue, childIds, ref list) ?? new List<T>();
         }
 
         public virtual DataTable ToDataTable()
diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableExecuteSqlAsync.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableExecuteSqlAsync.cs
index ff4bdff3f..852c0380c 100644
--- a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableExecuteSqlAsync.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableExecuteSqlAsync.cs
@@ -565,14 +565,14 @@ ParameterT parameter)
         public async Task<List<T>> ToTreeAsync(Expression<Func<T, IEnumerable<object>>> childListExpression, Expression<Func<T, object>> parentIdExpression, object rootValue, object[] childIds)
         {
             var list = await this.ToListAsync();
-            return TreeAndFilterIds(childListExpression, parentIdExpression, rootValue, childIds, ref list);
+            return TreeAndFilterIds(childListExpression, parentIdExpression, rootValue, childIds, ref list) ?? new List<T>();
         }
         public async Task<List<T>> ToTreeAsync(Expression<Func<T, IEnumerable<object>>> childListExpression, Expression<Func<T, object>> parentIdExpression, object rootValue)
         {
             var entity = this.Context.EntityMaintenance.GetEntityInfo<T>();
             var pk = GetTreeKey(entity); ;
             var list = await this.ToListAsync();
-            return GetTreeRoot(childListExpression, parentIdExpression, pk, list, rootValue);
+            return GetTreeRoot(childListExpression, parentIdExpression, pk, list, rootValue) ?? new List<T>();
         }
         public async Task<List<T>> ToParentListAsync(Expression<Func<T, object>> parentIdExpression, object primaryKeyValue)
         {