|
|
@@ -114,23 +114,25 @@ module.exports = (crowi) => {
|
|
|
// Search from input
|
|
|
const searchText = req.query.searchText || '';
|
|
|
const searchWord = new RegExp(`${searchText}`);
|
|
|
- const orColumns = ['name', 'username', 'email'];
|
|
|
- const orOutput = {};
|
|
|
- orColumns.forEach((element) => {
|
|
|
- orOutput[element] = { $in: searchWord };
|
|
|
- });
|
|
|
// Sort
|
|
|
const { sort, sortOrder } = req.query;
|
|
|
const sortOutput = {
|
|
|
[sort]: (sortOrder === 'desc') ? -1 : 1,
|
|
|
};
|
|
|
|
|
|
+ // { $or: [orOutput] },
|
|
|
try {
|
|
|
const paginateResult = await User.paginate(
|
|
|
{
|
|
|
$and: [
|
|
|
{ status: { $in: statusNoList } },
|
|
|
- { $or: [orOutput] },
|
|
|
+ {
|
|
|
+ $or: [
|
|
|
+ { name: { $in: searchWord } },
|
|
|
+ { username: { $in: searchWord } },
|
|
|
+ { email: { $in: searchWord } },
|
|
|
+ ],
|
|
|
+ },
|
|
|
],
|
|
|
},
|
|
|
{
|