diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java index b755f35a66..f0e8b1e5bc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java @@ -461,13 +461,20 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl data = volunteerMap.getData(); - return list.stream().map(item -> { + data.values().forEach(item -> { + for (int i = 0 ; i< list.size() ; i++){ + list.get(i).setLabel(item); + } + }); + + return list; + /*return list.stream().map(item -> { VolunteerPolyPieResultDTO dto = new VolunteerPolyPieResultDTO(); dto.setCode(item.getCode()); dto.setValue(item.getValue()); - dto.setLabel(item.getCode()); + dto.setLabel(item.getLabel()); return dto; - }).collect(Collectors.toList()); + }).collect(Collectors.toList());*/ } } \ No newline at end of file