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

config/config.js

@@ -44,8 +44,7 @@ module.exports = {
     getSessionURL:function (env="local") {
         let me = this;
         if(me[env].dbURL){
-            me[env].dbURL.replace('scConstruct','usersManages');
-            return me[env].dbURL
+            return me[env].dbURL.replace('scConstruct','usersManages');
         }
         if(me[env].options){
             return 'mongodb://'+ me[env].options.user +':'+ me[env].options.pass+'@'+ me[env].server+ ':'+ me[env].port + '/usersManages?authSource=admin';

modules/pm/controllers/pm_controller.js

@@ -214,7 +214,7 @@ module.exports = {
     index: async function(request, response) {
         // 获取编办信息
         let sessionCompilation = request.session.sessionCompilation;
-        if (sessionCompilation === undefined) {
+        if (sessionCompilation === undefined ||sessionCompilation ===null) {
             return response.redirect('/logout');
         }
         let compilationModel = new CompilationModel();

modules/users/models/user_model.js

@@ -91,9 +91,9 @@ class UserModel extends BaseModel {
         let userDataFromDb2 = await this.findDataBySsoId(userData.ssoId);
         let userDataFromDb = await this.findDataByName(userData.username);  //后面新增的账号可淘汰这方法，当前使用是为了兼容旧的账号
         let result = false;
-
         if (userDataFromDb === null && userDataFromDb2 === null) {
             // 不存在用户则入库
+            this.setScene();//恢复场景，用户有可能公司real_name等信息为空，不能设置为必填
             result = await this.addUser(userData);
             userDataFromDb = result;
         } else {
@@ -130,6 +130,11 @@ class UserModel extends BaseModel {
                 this.model.schema.path('province').required(true);
                 this.model.schema.path('version').required(true);
                 break;
+            case '':
+                this.model.schema.path('real_name').required(false);
+                this.model.schema.path('company').required(false);
+                this.model.schema.path('province').required(false);
+                this.model.schema.path('version').required(false);
         }
     }