From db2c14293c78f1250a525241e1079dfe57a8565f Mon Sep 17 00:00:00 2001
From: lyx <2027667395@qq.com>
Date: Sun, 7 Apr 2024 21:00:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84appends=E6=83=85=E5=86=B5=20feat=20#620?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .changeset/pretty-scissors-knock.md       |  5 ++
 packages/core/actions/src/actions/list.ts | 93 +++++++++++++----------
 2 files changed, 57 insertions(+), 41 deletions(-)
 create mode 100644 .changeset/pretty-scissors-knock.md

diff --git a/.changeset/pretty-scissors-knock.md b/.changeset/pretty-scissors-knock.md
new file mode 100644
index 000000000..cb300a3ea
--- /dev/null
+++ b/.changeset/pretty-scissors-knock.md
@@ -0,0 +1,5 @@
+---
+"@hera/plugin-rental": patch
+---
+
+树形结构关联查询完善
diff --git a/packages/core/actions/src/actions/list.ts b/packages/core/actions/src/actions/list.ts
index 498416e5d..cb7187e2d 100644
--- a/packages/core/actions/src/actions/list.ts
+++ b/packages/core/actions/src/actions/list.ts
@@ -2,7 +2,7 @@ import { assign } from '@nocobase/utils';
 import { Context } from '..';
 import { getRepositoryFromParams, pageArgsToLimitArgs } from '../utils';
 import { DEFAULT_PAGE, DEFAULT_PER_PAGE } from '../constants';
-import { QueryTypes } from 'sequelize';
+import { Op, QueryTypes } from 'sequelize';
 
 function totalPage(total, pageSize): number {
   return Math.ceil(total / pageSize);
@@ -43,6 +43,7 @@ async function listWithPagination(ctx: Context) {
     }
   });
   let filterTreeData = [];
+  let filterTreeCount = 0;
   if (ctx.action.params.tree) {
     const foreignKey = collection.treeParentField?.foreignKey || 'parentId';
     const params = Object.values(options.filter).flat()[0] || {};
@@ -55,48 +56,57 @@ async function listWithPagination(ctx: Context) {
         dataId = data.id;
       };
       await getParent(params);
-      const filterTreeDatas = await ctx.db.sequelize.query(
-        `
-      WITH RECURSIVE tree1 AS (
-        SELECT *
-        FROM ${collection.name}
-        WHERE id = :dataId
+      const query = `
+        WITH RECURSIVE tree1 AS (
+            SELECT id, "${foreignKey}"
+            FROM ${collection.name}
+            WHERE id = :dataId
 
-        UNION ALL
-
-        SELECT p.*
-        FROM tree1 up
-        JOIN ${collection.name} p ON up."${foreignKey}" = p.id
-      ),
-      tree2 AS (
-          SELECT *
-          FROM ${collection.name}
-          WHERE id = :dataId
-
-          UNION ALL
-
-          SELECT p.*
-          FROM tree2 down
-          JOIN ${collection.name} p ON down.id = p."${foreignKey}"
-      )
-      SELECT DISTINCT *
-        FROM (
-            SELECT * 
-            FROM tree1
             UNION ALL
-            SELECT * 
-            FROM tree2
-      )
-      `,
-        {
-          replacements: {
-            dataId,
-          },
-          type: QueryTypes.SELECT,
+
+            SELECT p.id, p."${foreignKey}"
+            FROM tree1 up
+            JOIN ${collection.name} p ON up."${foreignKey}" = p.id
+        ),
+        tree2 AS (
+            SELECT id, "${foreignKey}"
+            FROM ${collection.name}
+            WHERE id = :dataId
+
+            UNION ALL
+
+            SELECT p.id, p."${foreignKey}"
+            FROM tree2 down
+            JOIN ${collection.name} p ON down.id = p."${foreignKey}"
+        )
+        SELECT DISTINCT *
+        FROM (
+          SELECT * 
+          FROM tree1
+          UNION ALL
+          SELECT * 
+          FROM tree2
+      );`;
+      const filterTreeDatas = await ctx.db.sequelize.query(query, {
+        replacements: {
+          dataId,
         },
-      );
+        type: QueryTypes.SELECT,
+        // logging: console.log
+      });
       const newRows: any[] = filterTreeDatas;
-      const father = newRows.filter((parent) => parent.parentId === null);
+      const filterIds = newRows.map((item) => item.id);
+      const where = {
+        id: {
+          [Op.in]: filterIds,
+        },
+      };
+      const [rows, count] = await repository.findAndCount({
+        filter: where,
+        appends: options.appends || [],
+      });
+      const _data = rows.map((item) => item.dataValues);
+      const father = _data.filter((parent) => parent.parentId === null);
 
       const transTreeData = (father, allRows) => {
         father.forEach((parent, index) => {
@@ -117,13 +127,14 @@ async function listWithPagination(ctx: Context) {
           }
         });
       };
-      transTreeData(father, newRows);
+      transTreeData(father, _data);
       filterTreeData = father;
+      filterTreeCount = count;
     }
   }
   const [rows, count] = await repository.findAndCount(options);
   ctx.body = {
-    count,
+    count: filterTreeData.length ? filterTreeCount : count,
     rows: filterTreeData.length ? filterTreeData : rows,
     page: Number(page),
     pageSize: Number(pageSize),