Merge branch 'budget' of http://192.168.1.41:3000/SmartCost/ConstructionCost into budget

modules/reports/facade/rpt_tpl_data_facade.js

@@ -50,7 +50,7 @@ async function prepareMultiProjectData(userId, prjIds, filter) {
                             rawDataObj = {};
                             rawDataObj.prj = rst;
                             rawDataObj.prjData = results;
-                            /*
+                            //*
                             prjMdl.project.getBasicInfo(prjId).then(function(basicRst) {
                                 if (basicRst !== null && basicRst !== undefined) {
                                     let doc = (rawDataObj.prj._doc)?rawDataObj.prj._doc:rawDataObj.prj;

modules/reports/util/rpt_construct_data_util.js

@@ -1334,6 +1334,7 @@ function getDeepProperty(propKey, orgObj, destArr) {
     let parent = orgObj, lastVal = null;
     for (let key of keys) {
         if (parent instanceof Array) {
+            lastVal = null;
             for (let item of parent) {
                 if (item[dftPropKey] === key) {
                     lastVal = getActPropertyVal(dftPropVal, secDftPropVal, item);