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);