|
@@ -454,13 +454,7 @@ class UserModel extends BaseModel {
|
|
|
|
|
|
let keyword = request.query.keyword;
|
|
|
if (keyword !== '' && keyword !== undefined) {
|
|
|
- condition.$or = [{real_name : {$regex: keyword}},{email : {$regex: keyword}},{mobile : {$regex: keyword}},{company : {$regex: keyword}}];
|
|
|
- }
|
|
|
-
|
|
|
- let qq = request.query.qq;
|
|
|
- qq = qq !== '' && qq !== undefined ? parseInt(qq) : 0;
|
|
|
- if (qq !== 0) {
|
|
|
- condition.qq = qq;
|
|
|
+ condition.$or = [{real_name : {$regex: keyword}},{email : {$regex: keyword}},{mobile : {$regex: keyword}},{qq : {$regex: keyword}},{company : {$regex: keyword}}];
|
|
|
}
|
|
|
|
|
|
return condition;
|