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

modules/std_glj_lib/controllers/gljController.js

@@ -155,6 +155,7 @@ class GljController extends BaseController{
             lastOpr = req.body.lastOpr;
         gljDao.mixUpdateGljItems(repId, lastOpr, updateItems, addItems, removeIds, function(err, message, rst){
             if (err) {
+                console.log(err);
                 callback(req, res, err, message, null);
             } else {
                 callback(req, res, err, message, rst);

modules/users/controllers/compilation_controller.js

@@ -61,7 +61,7 @@ class CompilationController extends BaseController {
         } catch (error) {
             console.log(error);
         }
-        if (selectedCompilation.example) {
+        if (selectedCompilation.example && Array.isArray(selectedCompilation.example)) {
             selectedCompilation.example = selectedCompilation.example.join(';');
         }
         let renderData = {
@@ -241,7 +241,7 @@ class CompilationController extends BaseController {
             console.log(error);
         }
         //example Array to example String
-        if (selectedCompilation.example) {
+        if (selectedCompilation.example && Array.isArray(selectedCompilation.example)) {
             selectedCompilation.example = selectedCompilation.example.join(';');
         }
         let renderData = {
@@ -562,6 +562,7 @@ class CompilationController extends BaseController {
             response.json({err: 0, msg: 'success', data: null});
         }
         catch (err){
+            console.log(err);
             response.json({err: 1, msg: err, data: null});
         }
     }

modules/users/models/compilation_model.js

@@ -103,8 +103,10 @@ class CompilationModel extends BaseModel {
     * */
     async setExample(compilationId, example) {
         let data = [];
-        for (let projId of example) {
-            data.push(parseInt(projId));
+        if (example) {
+            for (let projId of example) {
+                data.push(parseInt(projId));
+            }
         }
         return await this.updateById(compilationId, {example: data});
     }

web/maintain/std_glj_lib/js/glj.js

@@ -1523,7 +1523,7 @@ let repositoryGljObj = {
             data:{"repositoryId": me.currentRepositoryId, "lastOpr": userAccount, "updateItems": JSON.stringify(updateArr), "addItems": JSON.stringify(addArr), "removeIds": JSON.stringify(removeIds)},
             dataType:"json",
             cache:false,
-            timeout:5000,
+            timeout:50000,
             success:function(result){
                 if (result.error) {
                     alert(result.message);