From 1c25659aa7ce901d2f276f87b8d0ab7f8d385c89 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Mon, 24 Oct 2022 15:16:37 +0800 Subject: [PATCH] Update ToTree() --- .../SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs | 6 +++--- .../SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs index f0c59080e..984a3b75d 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs @@ -187,9 +187,9 @@ namespace SqlSugar var currentId = id; List result = new List(); result.Add(id); - while (list.Any(it => pkName.PropertyInfo.GetValue(it).Equals(currentId))) + while (list.Any(it => pkName.PropertyInfo.GetValue(it).ObjToString()==currentId.ObjToString())) { - var data = list.First(it => pkName.PropertyInfo.GetValue(it).Equals(currentId)); + var data = list.First(it => pkName.PropertyInfo.GetValue(it).ObjToString() == currentId.ObjToString()); currentId = parentName.PropertyInfo.GetValue(data); result.Add(currentId); } @@ -207,7 +207,7 @@ namespace SqlSugar { newIds.AddRange(GetPrentIds(list, id, pkColumn, parentColumn)); } - list = list.Where(z => newIds.Any(it => it.Equals(pkColumn.PropertyInfo.GetValue(z)))).ToList(); + list = list.Where(z => newIds.Any(it => it.ObjToString()==pkColumn.PropertyInfo.GetValue(z).ObjToString())).ToList(); return GetTreeRoot(childListExpression, parentIdExpression, pk, list, rootValue); } diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs index f0c59080e..984a3b75d 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs @@ -187,9 +187,9 @@ namespace SqlSugar var currentId = id; List result = new List(); result.Add(id); - while (list.Any(it => pkName.PropertyInfo.GetValue(it).Equals(currentId))) + while (list.Any(it => pkName.PropertyInfo.GetValue(it).ObjToString()==currentId.ObjToString())) { - var data = list.First(it => pkName.PropertyInfo.GetValue(it).Equals(currentId)); + var data = list.First(it => pkName.PropertyInfo.GetValue(it).ObjToString() == currentId.ObjToString()); currentId = parentName.PropertyInfo.GetValue(data); result.Add(currentId); } @@ -207,7 +207,7 @@ namespace SqlSugar { newIds.AddRange(GetPrentIds(list, id, pkColumn, parentColumn)); } - list = list.Where(z => newIds.Any(it => it.Equals(pkColumn.PropertyInfo.GetValue(z)))).ToList(); + list = list.Where(z => newIds.Any(it => it.ObjToString()==pkColumn.PropertyInfo.GetValue(z).ObjToString())).ToList(); return GetTreeRoot(childListExpression, parentIdExpression, pk, list, rootValue); }