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

modules/reports/rpt_component/jpc_flow_tab.js

@@ -395,7 +395,8 @@ JpcFlowTabSrv.prototype.createNew = function(){
                             }
                         }
                         if (accAmt > rst) rst = accAmt;
-                        if (hasSplitStr && outputType !== JV.OUTPUT_TYPE_EXCEL) {
+                        // if (hasSplitStr && outputType !== JV.OUTPUT_TYPE_EXCEL) {
+                        if (hasSplitStr) {
                             let newValArr = [];
                             for (let i = 0; i < values.length; i++) {
                                 if (splitStrArr.indexOf(i) < 0) {
@@ -409,6 +410,7 @@ JpcFlowTabSrv.prototype.createNew = function(){
                             newValArr = [];
                         }
                         //备注： 如果outputType是excel类型，那么就只保留原始的分行符，无需介入分行，由excel本身去处理分行，只需要保留足够的空间即可。
+                        //      根据最新需求，暂时不考虑excel类型输出,换回原来逻辑
                     }
                 }
                 return 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 = {