From 525be8f7894e26b581b73173f8c452cc1c84bc6b Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 24 Dec 2019 17:24:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=BE=97=E5=88=86=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/service/impl/KpiRuleServiceImpl.java | 5 +++--
 1 file changed, 3 insertions(+), 2 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 a7e4e9bc9..a21ca4efc 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
@@ -467,11 +467,12 @@ public class KpiRuleServiceImpl extends BaseServiceImpl<KpiRuleDao, KpiRuleEntit
     private void saveOrUpdateKpiResult(KpiResultGridEntity kpiResultGridEntity) {
         //运算结果存储在 网格考核最终得分表 manual_score字段,:唯一性条件(deptId,scoreStartDate,scoreEndDate)
         KpiResultGridDTO kpiResultGridDto = getKpiresultGrid(kpiResultGridEntity.getGridId(), kpiResultGridEntity.getStartDate(), kpiResultGridEntity.getEndDate());
+        DeptLevelAndLeaderDTO deptLevelInfo = deptUtils.getDeptLevelInfo(kpiResultGridEntity.getGridId(), YesOrNoEnum.YES);
         if (kpiResultGridDto != null) {
             kpiResultGridEntity.setId(kpiResultGridDto.getId());
+            kpiResultGridEntity.setLeaderName(deptLevelInfo.getLeaderName());
             kpiResultGridDao.updateById(kpiResultGridEntity);
         } else {
-            DeptLevelAndLeaderDTO deptLevelInfo = deptUtils.getDeptLevelInfo(kpiResultGridEntity.getGridId(), YesOrNoEnum.YES);
             kpiResultGridEntity.setParentDeptIds(deptLevelInfo.getParentDeptIds());
             kpiResultGridEntity.setParentDeptNames(deptLevelInfo.getParentDeptNames());
             kpiResultGridEntity.setAllDeptIds(deptLevelInfo.getAllDeptIds());
@@ -526,7 +527,7 @@ public class KpiRuleServiceImpl extends BaseServiceImpl<KpiRuleDao, KpiRuleEntit
         }
         kpiResultSuperiorEntity.setKpiCycle(kpiCycle);
 
-        // 根据 考核规则表-主键，查询公式参数表,排序：1,2,3,4,5
+        // 根据 考核规则表-主键，查询公式参数表,排序：1,2,3,4,5,6
         List<KpiRuleParamDTO> ruleParamList = kpiRuleParamDao.queryFormulaParam(kpiRuleDTO.getId());
         List<String> metaDateCodeList = Lists.newArrayList();
         for (int i = 0; i < ruleParamList.size(); i++) {