diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java index 52a0718d..87fcc244 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java @@ -150,34 +150,37 @@ public class RegionServiceImpl extends ServiceImpl impleme Set lis = new HashSet<>(); v.forEach(it ->{ - RegionAllVO shi = new RegionAllVO(); - shi.setValue(it.getCityCode()); - shi.setLabel(it.getCityName()); - lis.add(shi); - List voList = new ArrayList<>(); - RegionAllVO qu = new RegionAllVO(); - qu.setValue(it.getDistrictCode()); - qu.setLabel(it.getDistrictName()); - voList.add(qu); - if(m.size() < 1){ - //没有数据 添加市 区数据 - - m.put(it.getCityCode(),voList); - }else{ - //有数据 判断是不是同一个市 - List voList2 = m.get(it.getCityCode()); - if(ObjectUtils.isNotNull(voList2)){ - //有一样的数据 - List voList1 = m.get(it.getCityCode()); - voList1.add(qu); - m.put(it.getCityCode(),voList1); - }else{ - //没有 - shi.setValue(it.getCityCode()); - shi.setLabel(it.getCityName()); + if(ObjectUtils.isNotNull(it.getCityCode())){ + RegionAllVO shi = new RegionAllVO(); + shi.setValue(it.getCityCode()); + shi.setLabel(it.getCityName()); + lis.add(shi); + List voList = new ArrayList<>(); + RegionAllVO qu = new RegionAllVO(); + qu.setValue(it.getDistrictCode()); + qu.setLabel(it.getDistrictName()); + voList.add(qu); + if(m.size() < 1){ + //没有数据 添加市 区数据 + m.put(it.getCityCode(),voList); + }else{ + //有数据 判断是不是同一个市 + List voList2 = m.get(it.getCityCode()); + if(ObjectUtils.isNotNull(voList2)){ + //有一样的数据 + List voList1 = m.get(it.getCityCode()); + voList1.add(qu); + m.put(it.getCityCode(),voList1); + }else{ + //没有 + shi.setValue(it.getCityCode()); + shi.setLabel(it.getCityName()); + m.put(it.getCityCode(),voList); + } } } + }); //有市对区的数据 lis.forEach(i ->{