From d2945b0fb262cdad924fe44c222e8829740a62c2 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Tue, 27 Jan 2026 15:33:15 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/impl/EventAnalysisServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/EventAnalysisServiceImpl.java b/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/EventAnalysisServiceImpl.java index a7771253a..083200af6 100644 --- a/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/EventAnalysisServiceImpl.java +++ b/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/EventAnalysisServiceImpl.java @@ -949,7 +949,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { Map reasonMap = new LinkedHashMap<>(); Map typeMap = new LinkedHashMap<>(); - info = info.stream().filter(temp->Objects.nonNull(temp.getAdvanceReason())||Objects.nonNull(temp.getAdvanceType())).collect(Collectors.toList()); + info = info.stream().filter(temp->StringUtils.isNotEmpty(temp.getAdvanceReason())||StringUtils.isNotEmpty(temp.getAdvanceType())).collect(Collectors.toList()); //添加detail for (RmpEventDetailPO detail : info) { EventDetail details = null; @@ -975,13 +975,13 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { //添加reason到map for (EventDetail data : list) { - if (Objects.nonNull(data.getAdvanceReason())&&reasonMap.get(data.getAdvanceReason()) != null) { + if (StringUtils.isNotEmpty(data.getAdvanceReason())&&reasonMap.get(data.getAdvanceReason()) != null) { reasonMap.put(data.getAdvanceReason(), reasonMap.get(data.getAdvanceReason()) + 1); } } //添加type到map for (EventDetail data : list) { - if (Objects.nonNull(data.getAdvanceType())&&typeMap.get(data.getAdvanceType()) != null) { + if (StringUtils.isNotEmpty(data.getAdvanceType())&&typeMap.get(data.getAdvanceType()) != null) { typeMap.put(data.getAdvanceType(), typeMap.get(data.getAdvanceType()) + 1); } } @@ -995,7 +995,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { } result.setTypes(typesVOS); result.setReason(reasonsVOS); - //result.setDetail(list); + result.setDetail(list); return result; }