Merge branch '1.0.0_online' of http://smartcost.f3322.net:3000/SmartCost/ConstructionOperation into 1.0.0_online

modules/users/controllers/user_controller.js

@@ -35,7 +35,7 @@ class UserController extends BaseController {
             let  compilationModel = new CompilationModel();
             compilationList = await compilationModel.getCompilationList({_id: 1, name: 1, is_release: 1});
             compilationString = JSON.stringify(compilationList);
-            compilationMap = _.indexBy(compilationList,'_id');
+            compilationMap = _.keyBy(compilationList,'_id');//4.17后的版本没有indexBy方法，改成了keyBy
             let condition = userModel.getFilterCondition(request);
             //设置搜索普通用户：
             condition.user_type = 'normal';
@@ -62,9 +62,11 @@ class UserController extends BaseController {
                 total: Math.ceil(total / Config.pageSize),
                 queryData: response.locals.urlQuery
             };
-
+            console.log("取用户信息=========================");
+            console.log(condition);
             // 获取用户列表
             userList = await userModel.getList(condition, page, Config.pageSize);
+            console.log(userList)
         } catch (error) {
             console.log(error);
         }
@@ -101,7 +103,7 @@ class UserController extends BaseController {
             let  compilationModel = new CompilationModel();
             compilationList = await compilationModel.getCompilationList({_id: 1, name: 1, is_release: 1});
             compilationString = JSON.stringify(compilationList);
-            compilationMap = _.indexBy(compilationList,'_id');
+            compilationMap = _.keyBy(compilationList,'_id');
             let condition = userModel.getFilterCondition(request);
             //设置搜索普通用户：
             condition.user_type = 'normal';

operation.js

@@ -71,8 +71,7 @@ app.use(function (req, res, next) {
             && req.headers["x-requested-with"] == "XMLHttpRequest"
             && req.url != "/login") {
             return res.json({ret_code: 99, ret_msg: '登录信息失效，请您重新登录'});
-        }
-        else{
+        } else{
             return res.redirect('/login');
         }
     }