Pārlūkot izejas kodu

项目指标报表容错(在没有经济指标情况下,不出错误)

TonyKang 6 gadi atpakaļ
vecāks
revīzija
380b40181e

+ 9 - 7
modules/main/facade/project_facade.js

@@ -431,14 +431,16 @@ function getEngineerInfoData(engineerInfos) {
 
 function getEngineerFeaturesDatas(engineerFeatures) {
     let datas = [];
-    for(let f of engineerFeatures){
-        let tem = {
-            ID:f.ID,
-            name:f.name,
-            value:f.value,
-            ParentID:f.ParentID
+    if (engineerFeatures !== null && engineerFeatures !== undefined) {
+        for(let f of engineerFeatures){
+            let tem = {
+                ID:f.ID,
+                name:f.name,
+                value:f.value,
+                ParentID:f.ParentID
+            }
+            datas.push(tem);
         }
-        datas.push(tem);
     }
     return datas;
 }

+ 2 - 2
test/unit/reports/test_tpl_project_fields.js

@@ -29,7 +29,7 @@ let pm_facade = require('../../../modules/pm/facade/pm_facade');
 
 let demoPrjId = - 1;
 // let demoRptId = 1006; //qa 重庆2018 A03
-let demoRptId = 1007; //qa 重庆2018 A01
+let demoRptId = 1005; //qa 重庆2018 A01
 let pagesize = "A4";
 
 
@@ -37,7 +37,7 @@ let pagesize = "A4";
 let userId_Leng = "5acac1e885bf55000bd055ba"; //小冷User Id2
 let userId_me = "5b6a60b1c4ba33000dd417c0"; //我的
 // let userId_HaiZhu = "5b5a66c4a3c23e000dccdd77"; //海珠user id
-demoPrjId = 8522; //
+demoPrjId = 9279; //
 //*/
 let userId_Dft = userId_Leng;
 // let userId_Dft = "5a025c4c15074d134c2b9689";