diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiRuleServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiRuleServiceImpl.java index aa2b717fb..ae2b87efb 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiRuleServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiRuleServiceImpl.java @@ -321,7 +321,7 @@ public class KpiRuleServiceImpl extends BaseServiceImpl metaDateCodeList = this.getRuleParmOfMetaDateCodeList(kpiRule.getId()); @@ -331,24 +331,25 @@ public class KpiRuleServiceImpl extends BaseServiceImpl NumConstant.ZERO) { - for (String deptTypeKey : deptTypeKeyArray) { - int pageIndex = NumConstant.ONE; - List deptIdList = deptUtils.getDeptIdList(deptTypeKey, NumConstant.TWENTY, pageIndex); - do { - for (Long deptId : deptIdList) { - BigDecimal[] paramValue = selectArrayOfMetaDataValue(deptId, startDate, endDate, metaDateCodeList); - // 参数准备完全时,执行js运算 - if (paramValue.length == paramAmount) { - // 执行js中的函数 参数:js方法名 + 参数 - Double score = this.calcByJavaScript(invocable, functionName, ruleCode, paramValue); - this.packageFormulaResultToSaveOrUpdate(deptId, ruleCode, score, startDate, endDate, kpiCycle); - } + if (null == deptTypeKeyArray || deptTypeKeyArray.length == NumConstant.ZERO) { + return; + } + for (String deptTypeKey : deptTypeKeyArray) { + int pageIndex = NumConstant.ONE; + List deptIdList = deptUtils.getDeptIdList(deptTypeKey, NumConstant.TWENTY, pageIndex); + do { + for (Long deptId : deptIdList) { + BigDecimal[] paramValue = selectArrayOfMetaDataValue(deptId, startDate, endDate, metaDateCodeList); + // 参数准备完全时,执行js运算 + if (paramValue.length == paramAmount) { + // 执行js中的函数 参数:js方法名 + 参数 + Double score = this.calcByJavaScript(invocable, functionName, ruleCode, paramValue); + this.packageFormulaResultToSaveOrUpdate(deptId, ruleCode, score, startDate, endDate, kpiCycle); } - pageIndex++; - deptIdList = deptUtils.getDeptIdList(deptTypeKey, NumConstant.TWENTY, pageIndex); - } while (CollUtil.isNotEmpty(deptIdList)); - } + } + pageIndex++; + deptIdList = deptUtils.getDeptIdList(deptTypeKey, NumConstant.TWENTY, pageIndex); + } while (CollUtil.isNotEmpty(deptIdList)); } }