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

modules/users/controllers/cld_controller.js

@@ -307,6 +307,10 @@ class CLDController {
             // 获取用户列表
             userList = await userModel.getList(condition, page, pageSize, sort);
             await online_facade.setOnlineTimes(userList,condition);
+            userList = JSON.parse(unescape(escape(JSON.stringify(userList))));
+            for (const userData of userList) {
+                userData.province = userData.province !== -1 ? userModel.province[userData.province] : '';
+            }
             response.json({error: 0, msg: 'success', data: {
                 userInfo: userList,
                 pageData: pageData,

modules/users/models/user_model.js

@@ -494,8 +494,8 @@ class UserModel extends BaseModel {
 
         // 企业所在地区
         let province = request.query.province;
-        province = province !== '' && province !== undefined ? parseInt(province) : 0;
-        if (province !== 0) {
+        province = province !== '' && province !== undefined ? parseInt(province) - 1 : -1;
+        if (province !== -1) {
             condition.province = province;
         }