|
@@ -1430,7 +1430,11 @@ function ext_getCalcProperty(templateIDs, calcItemKey, calcItemKeyVal, calcItemR
|
|
if (calcTplObj) {
|
|
if (calcTplObj) {
|
|
for (let calcItem of calcTplObj.calcItems) {
|
|
for (let calcItem of calcTplObj.calcItems) {
|
|
if (calcItem[calcItemKey] === calcItemKeyVal) {
|
|
if (calcItem[calcItemKey] === calcItemKeyVal) {
|
|
- rst.push(calcItem[calcItemRstKey]);
|
|
|
|
|
|
+ if (calcItem[calcItemRstKey] !== undefined && calcItem[calcItemRstKey] !== null) {
|
|
|
|
+ rst.push(calcItem[calcItemRstKey]);
|
|
|
|
+ } else {
|
|
|
|
+ rst.push(calcItem['feeRate']); //业务特点,如果上述key没有值的话,直接取‘feeRate’的value,省的去改指标定义了
|
|
|
|
+ }
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|