Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost

modules/users/controllers/login_controller.js

@@ -75,15 +75,19 @@ class LoginController {
             if (!result) {
                 throw '标记用户信息失败!';
             }
-
             let compilationModel = new CompilationModel();
-            compilationList = preferenceSetting.login_ask === 1 ? await compilationModel.getList() : [];
+            if(preferenceSetting.login_ask === 1 || preferenceSetting.select_version === ''){
+                preferenceSetting.login_ask = 1;
+                compilationList = await  compilationModel.getList();
+            }
+            else{
+                compilationList = [];
+            }
             // 获取编办信息
             let sessionCompilation = request.session.sessionCompilation;
 
             if (preferenceSetting.login_ask === 0 && !sessionCompilation &&
                 preferenceSetting.select_version !== '') {
-
                 let compilationData = await compilationModel.getCompilationById(preferenceSetting.select_version);
                 request.session.sessionCompilation = compilationData;
             }