- 修复 AsTreeCte + RereadSql 不能同时使用的 bug；#964

Author: 2881099

FreeSql/Extensions/FreeSqlGlobalExtensions.cs

@@ -520,11 +520,11 @@ WHERE @cte_ids IS NOT NULL
             }
             sql1ctePath = $"{sql1ctePath} as cte_path, ";
         }
-        var sql1 = select.ToSql($"0 as cte_level, {sql1ctePath}{select.GetAllFieldExpressionTreeLevel2().Field}").Trim();
+        var sql1 = select.ToSql($"0 as cte_level, {sql1ctePath}{select.GetAllFieldExpressionTreeLevel2(false).Field}").Trim();
 
         select._where.Clear();
         select.As("wct2");
-        var sql2Field = select.GetAllFieldExpressionTreeLevel2().Field;
+        var sql2Field = select.GetAllFieldExpressionTreeLevel2(false).Field;
         var sql2InnerJoinOn = up == false ?
             string.Join(" and ", tbref.Columns.Select((a, z) => $"wct2.{select._commonUtils.QuoteSqlName(tbref.RefColumns[z].Attribute.Name)} = wct1.{select._commonUtils.QuoteSqlName(a.Attribute.Name)}")) :
             string.Join(" and ", tbref.Columns.Select((a, z) => $"wct2.{select._commonUtils.QuoteSqlName(a.Attribute.Name)} = wct1.{select._commonUtils.QuoteSqlName(tbref.RefColumns[z].Attribute.Name)}"));

FreeSql/FreeSql.xml

@@ -533,7 +533,7 @@ public GetAllFieldExpressionTreeInfo GetAllFieldExpressionTreeLevelAll()
             });
         }
         static EventHandler<Aop.AuditDataReaderEventArgs> _OldAuditDataReaderHandler;
-        public GetAllFieldExpressionTreeInfo GetAllFieldExpressionTreeLevel2()
+        public GetAllFieldExpressionTreeInfo GetAllFieldExpressionTreeLevel2(bool isRereadSql = true)
         {
             if (_selectExpression != null) //ToSql
             {
@@ -549,7 +549,7 @@ public GetAllFieldExpressionTreeInfo GetAllFieldExpressionTreeLevel2()
                 _OldAuditDataReaderHandler = _orm.Aop.AuditDataReaderHandler; //清除单表 ExppressionTree
                 _dicGetAllFieldExpressionTree.TryRemove($"{_orm.Ado.DataType}-{_tables[0].Table.DbName}-{_tables[0].Table.CsName}-{_tables[0].Alias}-{_tables[0].Type}", out var oldet);
             }
-            return _dicGetAllFieldExpressionTree.GetOrAdd(string.Join("+", _tables.Select(a => $"{_orm.Ado.DataType}-{a.Table.DbName}-{a.Table.CsName}-{a.Alias}-{a.Type}")), s =>
+            return _dicGetAllFieldExpressionTree.GetOrAdd(string.Join("+", _tables.Select(a => $"{_orm.Ado.DataType}-{a.Table.DbName}-{a.Table.CsName}-{a.Alias}-{a.Type}-{(isRereadSql ? 1 : 0)}")), s =>
             {
                 var tb1 = _tables.First().Table;
                 var type = tb1.TypeLazy ?? tb1.Type;
@@ -583,7 +583,8 @@ public GetAllFieldExpressionTreeInfo GetAllFieldExpressionTreeLevel2()
                     { //普通字段
                         if (index > 0) field.Append(", ");
                         var quoteName = _commonUtils.QuoteSqlName(col.Attribute.Name);
-                        field.Append(_commonUtils.RereadColumn(col, $"{tb.Alias}.{quoteName}"));
+                        if (isRereadSql) field.Append(_commonUtils.RereadColumn(col, $"{tb.Alias}.{quoteName}"));
+                        else field.Append($"{tb.Alias}.{quoteName}");
                         ++index;
                         if (dicfield.ContainsKey(quoteName)) field.Append(_commonUtils.FieldAsAlias($"as{index}"));
                         else dicfield.Add(quoteName, true);
@@ -606,7 +607,8 @@ public GetAllFieldExpressionTreeInfo GetAllFieldExpressionTreeLevel2()
                         {
                             if (index > 0) field.Append(", ");
                             var quoteName = _commonUtils.QuoteSqlName(col2.Attribute.Name);
-                            field.Append(_commonUtils.RereadColumn(col2, $"{tb2.Alias}.{quoteName}"));
+                            if (isRereadSql) field.Append(_commonUtils.RereadColumn(col2, $"{tb2.Alias}.{quoteName}"));
+                            else field.Append($"{tb2.Alias}.{quoteName}");
                             ++index;
                             ++otherindex;
                             if (dicfield.ContainsKey(quoteName)) field.Append(_commonUtils.FieldAsAlias($"as{index}"));