|
|
@@ -315,13 +315,18 @@ module.exports = function(crowi) {
|
|
|
var User = this;
|
|
|
var option = option || {}
|
|
|
, sort = option.sort || {createdAt: -1}
|
|
|
- , status = option.status || STATUS_ACTIVE
|
|
|
+ , status = option.status || [STATUS_ACTIVE, STATUS_SUSPENDED]
|
|
|
, fields = option.fields || USER_PUBLIC_FIELDS
|
|
|
;
|
|
|
|
|
|
+ if (!Array.isArray(status)) {
|
|
|
+ status = [status];
|
|
|
+ }
|
|
|
+
|
|
|
return new Promise(function(resolve, reject) {
|
|
|
User
|
|
|
- .find({status: status })
|
|
|
+ .find()
|
|
|
+ .or(status.map(s => { return {status: s}; }))
|
|
|
.select(fields)
|
|
|
.sort(sort)
|
|
|
.exec(function (err, userData) {
|