From 37c29c0c8cb6b84efb4e9bb0dcba382d578fe7cf Mon Sep 17 00:00:00 2001
From: "tangly1024.com" <tlyong1992@hotmail.com>
Date: Fri, 4 Aug 2023 10:22:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E7=AB=A0=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/notion/getAllPageIds.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/notion/getAllPageIds.js b/lib/notion/getAllPageIds.js
index 4bb12fe0..b4428df7 100644
--- a/lib/notion/getAllPageIds.js
+++ b/lib/notion/getAllPageIds.js
@@ -3,16 +3,21 @@ export default function getAllPageIds (collectionQuery, collectionId, collection
   if (!collectionQuery && !collectionView) {
     return []
   }
-  let pageIds = []
   // 优先按照第一个视图排序
-  if (viewIds && viewIds.length > 0) {
-    const ids = collectionView[viewIds[0]].value.page_sort
-    // console.log('PageIds: 从viewId获取', viewIds)
-    for (const id of ids) {
-      pageIds.push(id)
+  let pageIds = []
+  try {
+    if (viewIds && viewIds.length > 0) {
+      const ids = collectionQuery[collectionId][viewIds[0]]?.collection_group_results?.blockIds
+      for (const id of ids) {
+        pageIds.push(id)
+      }
     }
-    // 否则按照数据库原始排序
-  } else if (collectionQuery && Object.values(collectionQuery).length > 0) {
+  } catch (error) {
+
+  }
+
+  // 否则按照数据库原始排序
+  if (pageIds.length === 0 && collectionQuery && Object.values(collectionQuery).length > 0) {
     const pageSet = new Set()
     Object.values(collectionQuery[collectionId]).forEach(view => {
       view?.blockIds?.forEach(id => pageSet.add(id)) // group视图