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

modules/users/controllers/cld_controller.js

@@ -231,6 +231,16 @@ class CLDController {
         }
     }
 
+    async provinceList(request, response) {
+        let userModel = new UserModel();
+        let responseData = {
+            error: 0,
+            msg: '',
+            data: userModel.province,
+        };
+        response.json(responseData);
+    }
+
     /**
      * 获取用户列表分页
      * @param request

modules/users/models/user_model.js

@@ -493,6 +493,13 @@ class UserModel extends BaseModel {
             condition.online_times = this.getOnlineTimestamp(onlineTimes);
         }
 
+        // 企业所在地区
+        let province = request.query.province;
+        province = province !== '' && province !== undefined ? parseInt(province) : 0;
+        if (province !== 0) {
+            condition.province = province;
+        }
+
         let keyword = request.query.keyword;
         if (keyword !== '' && keyword !== undefined) {
             condition.$or = [{real_name : {$regex: keyword}},{email : {$regex: keyword}},{mobile : {$regex: keyword}},{qq : {$regex: keyword}},{company : {$regex: keyword}}];

modules/users/routes/cld_route.js

@@ -32,5 +32,7 @@ module.exports = function (app) {
 
     router.get('/getRejectUsers', cldController.getRejectUsers);
 
+    router.get('/provinceList', cldController.provinceList);
+
     app.use('/cld',router)
 };