kaori 5 лет назад
Родитель
Сommit
93e73a1adb
1 измененных файлов с 16 добавлено и 15 удалено
  1. 16 15
      src/server/routes/apiv3/users.js

+ 16 - 15
src/server/routes/apiv3/users.js

@@ -181,13 +181,23 @@ module.exports = (crowi) => {
       [sort]: (sortOrder === 'desc') ? -1 : 1,
     };
 
+    const orConditions = [
+      { name: { $in: searchWord } },
+      { username: { $in: searchWord } },
+    ];
+
+    const query = {
+      $and: [
+        { status: { $in: statusNoList } },
+        {
+          $or: orConditions,
+        },
+      ],
+    };
+
     try {
-      const filter = [
-        { name: { $in: searchWord } },
-        { username: { $in: searchWord } },
-      ];
       if (req.user != null) {
-        filter.push(
+        orConditions.push(
           {
             $and: [
               { isEmailPublished: true },
@@ -197,18 +207,9 @@ module.exports = (crowi) => {
         );
       }
       if (forceIncludeAttributes.includes('email')) {
-        filter.push({ email: { $in: searchWord } });
+        orConditions.push({ email: { $in: searchWord } });
       }
 
-      const query = {
-        $and: [
-          { status: { $in: statusNoList } },
-          {
-            $or: filter,
-          },
-        ],
-      };
-
       const paginateResult = await User.paginate(
         query,
         {