فهرست منبع

Merge pull request #1772 from weseek/imprv/inc-search-server-side-correction

Changed or output to $or
ryuichi-e 6 سال پیش
والد
کامیت
b767b3da40
1فایلهای تغییر یافته به همراه7 افزوده شده و 6 حذف شده
  1. 7 6
      src/server/routes/apiv3/users.js

+ 7 - 6
src/server/routes/apiv3/users.js

@@ -159,11 +159,6 @@ module.exports = (crowi) => {
     // Search from input
     // Search from input
     const searchText = req.query.searchText || '';
     const searchText = req.query.searchText || '';
     const searchWord = new RegExp(`${searchText}`);
     const searchWord = new RegExp(`${searchText}`);
-    const orColumns = ['name', 'username', 'email'];
-    const orOutput = {};
-    orColumns.forEach((element) => {
-      orOutput[element] = { $in: searchWord };
-    });
     // Sort
     // Sort
     const { sort, sortOrder } = req.query;
     const { sort, sortOrder } = req.query;
     const sortOutput = {
     const sortOutput = {
@@ -175,7 +170,13 @@ module.exports = (crowi) => {
         {
         {
           $and: [
           $and: [
             { status: { $in: statusNoList } },
             { status: { $in: statusNoList } },
-            { $or: [orOutput] },
+            {
+              $or: [
+                { name: { $in: searchWord } },
+                { username: { $in: searchWord } },
+                { email: { $in: searchWord } },
+              ],
+            },
           ],
           ],
         },
         },
         {
         {