From 8311d35774b7b2b6b43d5fb8853f6ea47573eb5c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 2 Jun 2021 09:22:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E7=A7=AF=E5=88=86=E6=8E=92?= =?UTF-8?q?=E8=A1=8Cbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BizPointTotalDetailServiceImpl.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java index 554256b55e..683347a350 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java @@ -37,6 +37,7 @@ import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.service.BizPointTotalDetailService; import com.epmet.service.BizPointUserTotalDetailService; import com.epmet.service.UserPointActionLogService; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -182,6 +183,9 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl totalDetailList = baseDao.selectList(wrapper); Result> groupList = resiGroupOpenFeignClient.getGroupListByGrid(formDTO.getGridId()); + if (!groupList.success() || CollectionUtils.isEmpty(groupList.getData())) { + return Collections.emptyList(); + } list = groupList.getData().stream().map(item -> { GroupPointRankingResultDTO dto = new GroupPointRankingResultDTO(); dto.setGroupId(item.getId()); @@ -194,14 +198,16 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl totalDetailList.stream().filter(detail -> item.getGroupId().equals(detail.getObjectId())).forEach(total -> { - item.setPoint(total.getTotalPoint().toString()); + if (CollectionUtils.isNotEmpty(totalDetailList)) { + list.forEach(item -> totalDetailList.stream().filter(detail -> item.getGroupId().equals(detail.getObjectId())).forEach(total -> { + item.setPoint(total.getTotalPoint().toString()); - })); + })); + } list = list.stream().sorted(Comparator.comparing(GroupPointRankingResultDTO :: getPoint, Comparator.comparingInt(Integer::parseInt)).reversed() .thenComparing(GroupPointRankingResultDTO::getGroupName, Collator.getInstance(Locale.CHINA))) - .collect(Collectors.toList()); + .collect(Collectors.toList()); AtomicInteger i = new AtomicInteger(1); list.forEach(dto -> { dto.setRanking(String.valueOf(i.getAndIncrement()));