|
@@ -65,16 +65,12 @@ public class RegionLimitHelperImpl extends AbstractRegionLimitHelper { |
|
|
public List<RegionContainsBO> queryContainsRegionAssembler(RegionContainsBO queryRegionContainBo, List<RegionContainsBO> expertAdminContainsRegionList) { |
|
|
public List<RegionContainsBO> queryContainsRegionAssembler(RegionContainsBO queryRegionContainBo, List<RegionContainsBO> expertAdminContainsRegionList) { |
|
|
List<RegionContainsBO> resultBoList = new ArrayList<>(); |
|
|
List<RegionContainsBO> resultBoList = new ArrayList<>(); |
|
|
if (Objects.nonNull(queryRegionContainBo)) { |
|
|
if (Objects.nonNull(queryRegionContainBo)) { |
|
|
resultBoList.add(queryRegionContainBo); |
|
|
|
|
|
Integer parentRegionTreeLevel = queryRegionContainBo.getParentRegionTreeLevel(); |
|
|
|
|
|
List<String> containsRegionCodeList = queryRegionContainBo.getContainsRegionCodeList(); |
|
|
List<String> containsRegionCodeList = queryRegionContainBo.getContainsRegionCodeList(); |
|
|
|
|
|
|
|
|
// 查询取并级 |
|
|
// 查询取并级 |
|
|
if (CollectionUtils.isNotEmpty(expertAdminContainsRegionList)) { |
|
|
if (CollectionUtils.isNotEmpty(expertAdminContainsRegionList)) { |
|
|
for (RegionContainsBO regionContainsBO : expertAdminContainsRegionList) { |
|
|
for (RegionContainsBO regionContainsBO : expertAdminContainsRegionList) { |
|
|
regionContainsBO.setParentRegionTreeLevel(parentRegionTreeLevel); |
|
|
|
|
|
List<String> regionCodeList = regionContainsBO.getContainsRegionCodeList(); |
|
|
List<String> regionCodeList = regionContainsBO.getContainsRegionCodeList(); |
|
|
regionCodeList = regionCodeList.stream().filter(containsRegionCodeList::contains).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
regionCodeList.retainAll(containsRegionCodeList); |
|
|
if (CollectionUtils.isNotEmpty(regionCodeList)) { |
|
|
if (CollectionUtils.isNotEmpty(regionCodeList)) { |
|
|
regionContainsBO.setContainsRegionCodeList(regionCodeList); |
|
|
regionContainsBO.setContainsRegionCodeList(regionCodeList); |
|
|
resultBoList.add(regionContainsBO); |
|
|
resultBoList.add(regionContainsBO); |
|
|