diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRegionController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRegionController.java index 71d32e98..6835f24e 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRegionController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRegionController.java @@ -37,7 +37,17 @@ public class AdminRegionController { public Object list() { List regionVoList = new ArrayList<>(); - List provinceList = regionService.queryByPid(0); + List litemallRegions = regionService.getAll(); + Map> collect = litemallRegions.stream().collect(Collectors.groupingBy(LitemallRegion::getType)); + byte provinceType = 1; + List provinceList = collect.get(provinceType); + byte cityType = 2; + List city = collect.get(cityType); + Map> cityListMap = city.stream().collect(Collectors.groupingBy(LitemallRegion::getPid)); + byte areaType = 3; + List areas = collect.get(areaType); + Map> areaListMap = areas.stream().collect(Collectors.groupingBy(LitemallRegion::getPid)); + for (LitemallRegion province : provinceList) { RegionVo provinceVO = new RegionVo(); provinceVO.setId(province.getId()); @@ -47,7 +57,7 @@ public class AdminRegionController { List cityList = cityListMap.get(province.getId()); List cityVOList = new ArrayList<>(); - for (LitemallRegion city : cityList) { + for (LitemallRegion cityVo : cityList) { RegionVo cityVO = new RegionVo(); cityVO.setId(cityVo.getId()); cityVO.setName(cityVo.getName());