|
|
@@ -141,7 +141,7 @@ public class WeatherWarningServiceImpl extends ServiceImpl<WeatherWarningMapper,
|
|
|
List<CityInfoVo> list = baseMapper.cityInfoVoList();
|
|
|
List<CityInfoVo> lista = list.stream().filter(r->r.getGroupId().equals("-1")).collect(Collectors.toList());
|
|
|
lista.forEach(r->{
|
|
|
- SelectCityInfoVo selectCityInfoVo = SelectCityInfoVo.builder().value(r.getAreaId()).label(r.getNameCn()).children(new ArrayList<>()).build();
|
|
|
+ SelectCityInfoVo selectCityInfoVo = SelectCityInfoVo.builder().value(r.getAreaId()+r.getGroupId()).label(r.getNameCn()).children(new ArrayList<>()).build();
|
|
|
List<CityInfoVo> listb = list.stream().filter(s->s.getGroupId().equals(r.getAreaId())||s.getAreaId().equals(r.getAreaId())).collect(Collectors.toList());
|
|
|
listb.forEach(a->{
|
|
|
selectCityInfoVo.getChildren().add(SelectCityInfoVo.builder().value(a.getAreaId()).label(a.getNameCn()).build());
|