修改用户列表接口查询方式

modules/users/controllers/cld_controller.js

@@ -284,12 +284,6 @@ class CLDController {
                 filter.loginMsg = userModel.getDayMsg(loginTime);
             }
 
-            //获取ssoId列表
-            let ssoIds = request.query.ssoIds;
-            if (ssoIds !== '' && ssoIds !== undefined){
-                condition.ssoId = JSON.parse(ssoIds);
-            }
-
             // 排序方式
             let sortType = request.query.sortType !== '' && request.query.sortType !== undefined ? request.query.sortType : -1;
 

modules/users/models/user_model.js

@@ -165,6 +165,13 @@ class UserModel extends BaseModel {
         if (keyword !== '' && keyword !== undefined) {
             condition.$or = [{real_name : {$regex: keyword}},{email : {$regex: keyword}},{mobile : {$regex: keyword}},{qq : {$regex: keyword}},{company : {$regex: keyword}}];
         }
+        //获取ssoId列表
+        let ssoIds = request.query.ssoIds;
+        if (keyword !== '' && keyword !== undefined && ssoIds !== '' && ssoIds !== undefined) {
+            condition.$or.push({ssoId: JSON.parse(ssoIds)});
+        } else if (ssoIds !== '' && ssoIds !== undefined) {
+            condition.ssoId = JSON.parse(ssoIds);
+        }
 
         return condition;
     }