- 修复 嵌套查询DTO映射可能触发循环引用 bug；

2881099 · 2881099 · commit 65bbee93a2a4 · 2023-12-15T19:55:52.000+08:00
diff --git a/Extensions/FreeSql.Extensions.ZoreEntity/FreeSql.Extensions.ZoreEntity.csproj b/Extensions/FreeSql.Extensions.ZoreEntity/FreeSql.Extensions.ZoreEntity.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.807-preview20231214</Version>
+		<Version>3.2.806</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 
diff --git a/FreeSql/Internal/CommonExpression.cs b/FreeSql/Internal/CommonExpression.cs
@@ -2568,6 +2568,7 @@ public List<Expression[]> MatchDtoPropertys(SelectTableInfo tb, PropertyInfo dto
         {
             if (tb == null || dtoProp == null || tb.Parameter == null) return null;
             var retList = new List<Expression[]>();
+            var matchIgnores = new Dictionary<PropertyInfo, bool>();
             var retExp = LocalMatch(tb.Parameter.Type, tb.Parameter);
             if (retList.Any() == false) retList.Add(new[] { retExp });
             return retList;
@@ -2584,7 +2585,9 @@ Expression LocalMatch(Type type, Expression memExp)
                         if (Utils.dicExecuteArrayRowReadClassOrTuple.ContainsKey(typeProp.PropertyType)) continue;
                         if (typeProp.PropertyType.IsAnonymousType() || _common.GetTableByEntity(typeProp.PropertyType)?.Columns.Any() == true)
                         {
-                            var nextExp = Expression.MakeMemberAccess(memExp, typeProp);
+                            if (matchIgnores.ContainsKey(typeProp)) continue;
+                            matchIgnores.Add(typeProp, true);
+							var nextExp = Expression.MakeMemberAccess(memExp, typeProp);
                             var ret = LocalMatch(typeProp.PropertyType, nextExp);
                             if (ret != null)
                             {

Original file line number	Diff line number	Diff line change
`@@ -2568,6 +2568,7 @@ public List<Expression[]> MatchDtoPropertys(SelectTableInfo tb, PropertyInfo dto`
`2568`	`2568`	`{`
`2569`	`2569`	`if (tb == null \|\| dtoProp == null \|\| tb.Parameter == null) return null;`
`2570`	`2570`	`var retList = new List<Expression[]>();`
	`2571`	`+ var matchIgnores = new Dictionary<PropertyInfo, bool>();`
`2571`	`2572`	`var retExp = LocalMatch(tb.Parameter.Type, tb.Parameter);`
`2572`	`2573`	`if (retList.Any() == false) retList.Add(new[] { retExp });`
`2573`	`2574`	`return retList;`
`@@ -2584,7 +2585,9 @@ Expression LocalMatch(Type type, Expression memExp)`
`2584`	`2585`	`if (Utils.dicExecuteArrayRowReadClassOrTuple.ContainsKey(typeProp.PropertyType)) continue;`
`2585`	`2586`	`if (typeProp.PropertyType.IsAnonymousType() \|\| _common.GetTableByEntity(typeProp.PropertyType)?.Columns.Any() == true)`
`2586`	`2587`	`{`
`2587`		`- var nextExp = Expression.MakeMemberAccess(memExp, typeProp);`
	`2588`	`+ if (matchIgnores.ContainsKey(typeProp)) continue;`
	`2589`	`+ matchIgnores.Add(typeProp, true);`
	`2590`	`+ var nextExp = Expression.MakeMemberAccess(memExp, typeProp);`
`2588`	`2591`	`var ret = LocalMatch(typeProp.PropertyType, nextExp);`
`2589`	`2592`	`if (ret != null)`
`2590`	`2593`	`{`