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) {