diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/region/RegionInfoService.java b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/region/RegionInfoService.java index f21d5bf04..ee84c7ad9 100644 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/region/RegionInfoService.java +++ b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/region/RegionInfoService.java @@ -15,7 +15,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -38,11 +40,7 @@ public class RegionInfoService extends ServiceImpl throw new ServiceException(BusiStatus.USERNOTEXISTS); } - List partitionRegionList = listByPartitionId(u.getPartitionId()); - // 业务逻辑,新区只能看到新区国家,老区能兼容老区和新区国家 - return partitionRegionList.stream() - .filter(regionInfo -> u.getPartitionId() <= regionInfo.getPartitionId()) - .collect(Collectors.toList()); + return listByPartitionId(u.getPartitionId()); } public void save(Long uid, Integer id) { @@ -83,7 +81,15 @@ public class RegionInfoService extends ServiceImpl } public List listByPartitionId(Integer partitionId) { - return this.baseMapper.listByPartitionId(partitionId); + List regionInfos = this.baseMapper.listByPartitionId(partitionId); + if (CollectionUtils.isEmpty(regionInfos)){ + return Collections.emptyList(); + } + + // 业务逻辑,新区只能看到新区国家,老区能兼容老区和新区国家 + return regionInfos.stream() + .filter(regionInfo -> partitionId <= regionInfo.getPartitionId()) + .collect(Collectors.toList()); } public Map getRegionName(){