moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

地区-后台-用户信息-老区兼容新区

Browse Source
This commit is contained in:
khalil
2025-05-30 15:35:26 +08:00
parent 29555e4eb0
commit ff2530e24e
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/region/RegionInfoService.java
View File

@@ -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<RegionInfoMapper, RegionInfo>
throw new ServiceException(BusiStatus.USERNOTEXISTS);
}
List<RegionInfo> 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<RegionInfoMapper, RegionInfo>
}
public List<RegionInfo> listByPartitionId(Integer partitionId) {
return this.baseMapper.listByPartitionId(partitionId);
List<RegionInfo> 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<Integer, String> getRegionName(){