提交代码

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java

@@ -143,7 +143,7 @@ public class RedisKeys {
      * 部门关系
      */
     public static String getDeptOptionKey(Long deptId) {
-        return rootPrefix.concat("options:dept:all:").concat(String.valueOf(deptId));
+        return rootPrefix.concat("options:dept:common:").concat(String.valueOf(deptId));
     }
 
     /**

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreRuleServiceImpl.java

@@ -100,7 +100,7 @@ public class KpiManualScoreRuleServiceImpl extends BaseServiceImpl<KpiManualScor
     public Result update(KpiManualScoreRuleDTO dto) {
         KpiManualScoreRuleEntity entity = ConvertUtils.sourceToTarget(dto, KpiManualScoreRuleEntity.class);
         //根据id去查询epdc_kpi_rule表，如果存在记录,需要同步更新考核周期、考核部门
-        String referenceIds[] = new String[1];
+        String[] referenceIds = new String[1];
         referenceIds[0] = dto.getId();
         List<KpiRuleEntity> kpiRuleEntityList = kpiRuleService.listKpiRuleEntityByRereferenceId(referenceIds);
         if (null != kpiRuleEntityList && kpiRuleEntityList.size() > 0) {

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/utils/DeptUtils.java

@@ -14,6 +14,8 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 /**
+ * 获取部门信息
+ *
  * @author work@yujt.net.cn
  * @date 2019/12/18 14:52
  */
@@ -37,14 +39,10 @@ public class DeptUtils {
      */
     public DeptLevelAndLeaderDTO getDeptLevelInfo(Long deptId, YesOrNoEnum yesOrNo) {
         DeptLevelAndLeaderDTO dto = (DeptLevelAndLeaderDTO) redisUtils.get(RedisKeys.getDeptOptionKey(deptId));
-
         if (null != dto) {
-            if (YesOrNoEnum.NO.value().equals(yesOrNo.value())) {
+            // 已取到网格长姓名或者不需要网格长姓名 直接返回
+            if ((StringUtils.isNotBlank(dto.getLeaderName()) || YesOrNoEnum.NO.value().equals(yesOrNo.value()))) {
                 return dto;
-            } else {
-                if (StringUtils.isNotBlank(dto.getLeaderName())) {
-                    return dto;
-                }
             }
         }
         Result<DeptLevelAndLeaderDTO> result = adminFeignClient.getDeptInfoById(deptId, yesOrNo.value());