From 9079e8682bcc7c98aa1870217d1b05f6867e3007 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Fri, 29 Mar 2024 11:16:51 +0800 Subject: [PATCH] =?UTF-8?q?#FDP=E5=91=8A=E8=AD=A6=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java index 23fc8ca..5a6844d 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java @@ -72,11 +72,10 @@ public class FdpAlarmServiceImpl implements FdpAlarmService { if (ObjectUtils.isEmpty(alarms)) { return new ArrayList<>(); } - if(!FDP_INVALID_STATUS.equals(alarms.getStatus()) && !FDP_INVALID_ZOME_STATUS.equals(alarms.getStatus())){ - return new ArrayList(); + if(FDP_INVALID_STATUS.equals(alarms.getStatus()) || FDP_INVALID_ZOME_STATUS.equals(alarms.getStatus())){ + return Collections.singletonList(getAlarmEntity(alarms)); } - AlarmEntity entity = getAlarmEntity(alarms); - return Collections.singletonList(entity); + return new ArrayList<>(); } private AlarmEntity getAlarmEntity(FdpAlarmVo item) {