Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuOperation

modules/common/const/bills_fixed.js

@@ -88,6 +88,7 @@ const fixedFlag = {
     EMERGENCY_FEE: 42,
     // 施工环保费
     CONSTRUCTION_ENVIROMENTAL_PROTECTION_FEE: 43,
+    OTHER_NEW_FEE: 44,
 };
 /*建筑安装工程费、土地使用及拆迁补偿费、养护工程其他费用、预备费、基本预备费、价差预备费、一二三四部分合计、贷款利息、总造价、
 
@@ -138,6 +139,7 @@ const fixedFlagList = [
     {name: "暂列金额", value: fixedFlag.PROVISIONAL},
     {name:"安全生产费",value:fixedFlag.SAFE_COST},
     {name:"第100章清单 总则",value:fixedFlag.ONE_HUNDRED_BILLS},
+    {name: '其他新增费用', value: fixedFlag.OTHER_NEW_FEE},
 ];
 
 export {fixedFlag as default, fixedFlagList as List};

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;
     }