From 47403ca38bf8d4a619e361f15a95d625edddff1a Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Wed, 25 Dec 2019 11:17:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=B8=8A=E6=AC=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/service/impl/KpiRuleServiceImpl.java | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

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<KpiRuleDao, KpiRuleEntit
         Date endDate = LocalDateUtils.localDateToDate(YearMonth.now().minusMonths(NumConstant.ONE).atEndOfMonth());
         // 根据 考核规则表-外键(公式id)，查询绩效考核公式表，待运行公式方法
         KpiFormulaDTO kpiFormula = kpiFormulaDao.queryFormula(kpiRule.getReferenceId());
-        // 初始化JavaScript引擎
+        // 初始化JavaScriptEngine引擎
         Invocable invocable = this.initInvocable(kpiFormula.getFormula(), ruleCode);
         // 公式所有参数对应的元数据编码、升序排列
         List<String> metaDateCodeList = this.getRuleParmOfMetaDateCodeList(kpiRule.getId());
@@ -331,24 +331,25 @@ public class KpiRuleServiceImpl extends BaseServiceImpl<KpiRuleDao, KpiRuleEntit
         String functionName = kpiFormula.getFunctionName();
         // 部门类别
         String[] deptTypeKeyArray = kpiRule.getDeptTypeKey().split(StrConstant.COMMA);
-        if (deptTypeKeyArray.length > NumConstant.ZERO) {
-            for (String deptTypeKey : deptTypeKeyArray) {
-                int pageIndex = NumConstant.ONE;
-                List<Long> 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<Long> 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));
         }
     }