diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java index c5a45f95b..b927112fd 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java +++ b/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)); } /** diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreRuleServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreRuleServiceImpl.java index 24184f2a4..d79d6e29b 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreRuleServiceImpl.java +++ b/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 kpiRuleEntityList = kpiRuleService.listKpiRuleEntityByRereferenceId(referenceIds); if (null != kpiRuleEntityList && kpiRuleEntityList.size() > 0) { diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/utils/DeptUtils.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/utils/DeptUtils.java index 31a8cfdc0..e3824f39a 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/utils/DeptUtils.java +++ b/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 result = adminFeignClient.getDeptInfoById(deptId, yesOrNo.value());