From 585f053fbd71c51177835237476d4ea6d0eda29c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 30 Jun 2021 16:28:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E9=80=BB=E8=BE=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/dao/evaluationindex/EvaluationIndexDao.java | 2 +- .../evaluationindex/impl/EvaluationIndexServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java index fd509f640d..197b4e05e6 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java @@ -90,7 +90,7 @@ public interface EvaluationIndexDao { List getAgencyIdsByAgencyId(@Param("agencyId") String agencyId, @Param("areaCode") String areaCode, @Param("list") List list); /** - * @Description 查询直属下级组织列表，有areaCode的按areaCode查，没有的按agencyId查 + * @Description 查询直属下级组织列表，有areaCode的按areaCode查，没有的按agencyId查且是在当前客户和子客户范围内查询 * @author sun */ List getSubAgencyListByAgency(@Param("agencyId") String agencyId, @Param("areaCode") String areaCode, @Param("list") List list); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java index 8351deeaf6..3fd170de55 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java @@ -124,7 +124,7 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService { } /** - * @Description 查询直属下级组织列表，有子客户的按areaCode查没有的按agencyId查 + * @Description 查询直属下级组织列表，有子客户的按areaCode查没有的按agencyId查且是在当前客户和子客户范围内查询 * @author sun */ @Override @@ -136,6 +136,7 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService { if (!CollectionUtils.isNotEmpty(list)) { return evaluationIndexDao.getSubAgencyListByAgency(agencyId, null, null); } else { + list.add(agencyId); return evaluationIndexDao.getSubAgencyListByAgency(null, dto.getAreaCode(), list); } }