Taichi Masuyama 4 лет назад
Родитель
Сommit
b4ad171fbe
1 измененных файлов с 15 добавлено и 16 удалено
  1. 15 16
      packages/app/src/server/service/page.ts

+ 15 - 16
packages/app/src/server/service/page.ts

@@ -1821,30 +1821,29 @@ class PageService {
     }
 
     // generate filter
-    let filter: any = {
-      parent: null,
-      path: { $ne: '/' },
-      status: Page.STATUS_PUBLISHED,
+    const filter: any = {
+      $and: [
+        {
+          parent: null,
+          status: Page.STATUS_PUBLISHED,
+          path: { $ne: '/' },
+        },
+      ],
     };
     if (regexps != null && regexps.length !== 0) {
-      filter = {
-        ...filter,
-        path: {
-          $in: regexps,
-        },
-      };
+      filter.$and.push({
+        parent: null,
+        status: Page.STATUS_PUBLISHED,
+        path: { $in: regexps },
+      });
     }
 
     const total = await Page.countDocuments(filter);
 
     let baseAggregation = Page
       .aggregate([
-        {
-          $match: grantFilter,
-        },
-        {
-          $match: filter,
-        },
+        { $match: grantFilter },
+        { $match: filter },
         {
           $project: { // minimize data to fetch
             _id: 1,