From d24bf35d27a733944536b086f8423aef79db872f Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Mon, 4 Dec 2023 17:50:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningdatech/pmapi/dashboard/manage/ExpertStatisticsManage.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/ExpertStatisticsManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/ExpertStatisticsManage.java index fd05d39..0e2f01d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/ExpertStatisticsManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/ExpertStatisticsManage.java @@ -173,8 +173,9 @@ public class ExpertStatisticsManage { Map expertMap = experts.stream().filter(e -> userSet.add(e.getUserId())) .collect(Collectors.toMap(ExpertUserFullInfo::getUserId, e -> e)); - List regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_COUNTY) - .stream().sorted(Comparator.comparing(RegionDTO::getRegionCode)).collect(Collectors.toList()); + List regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_CITY) + .stream().filter(r -> r.getRegionLevel().equals(RegionConst.RL_COUNTY)) + .sorted(Comparator.comparing(RegionDTO::getRegionCode)).collect(Collectors.toList()); //是否要筛选年 experts = experts.stream().filter(e -> {