From 4c4fb0e4d51cd29e81fdfbd2fcede5ff94da80d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?niohe=C2=B7erbao?= Date: Wed, 5 Jul 2023 09:35:51 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=B8=82=E6=9C=AC=E7=BA=A7=E4=B8=93?= =?UTF-8?q?=E5=AE=B6=E7=AE=A1=E7=90=86=E5=91=98=E6=97=A0=E6=B3=95=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E8=AF=A5=E5=B8=82=E5=8C=BA=E5=8E=BF=E4=B8=8B=E7=9A=84?= =?UTF-8?q?=E4=B8=93=E5=AE=B6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningdatech/pmapi/common/helper/impl/RegionLimitHelperImpl.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/impl/RegionLimitHelperImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/impl/RegionLimitHelperImpl.java index 29401d3..cf78e50 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/impl/RegionLimitHelperImpl.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/impl/RegionLimitHelperImpl.java @@ -65,16 +65,12 @@ public class RegionLimitHelperImpl extends AbstractRegionLimitHelper { public List queryContainsRegionAssembler(RegionContainsBO queryRegionContainBo, List expertAdminContainsRegionList) { List resultBoList = new ArrayList<>(); if (Objects.nonNull(queryRegionContainBo)) { - resultBoList.add(queryRegionContainBo); - Integer parentRegionTreeLevel = queryRegionContainBo.getParentRegionTreeLevel(); List containsRegionCodeList = queryRegionContainBo.getContainsRegionCodeList(); - // 查询取并级 if (CollectionUtils.isNotEmpty(expertAdminContainsRegionList)) { for (RegionContainsBO regionContainsBO : expertAdminContainsRegionList) { - regionContainsBO.setParentRegionTreeLevel(parentRegionTreeLevel); List regionCodeList = regionContainsBO.getContainsRegionCodeList(); - regionCodeList = regionCodeList.stream().filter(containsRegionCodeList::contains).collect(Collectors.toList()); + regionCodeList.retainAll(containsRegionCodeList); if (CollectionUtils.isNotEmpty(regionCodeList)) { regionContainsBO.setContainsRegionCodeList(regionCodeList); resultBoList.add(regionContainsBO);