diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index d2cc7f1..0ee8d84 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -49,7 +49,12 @@ @Override public boolean cancelAlarm(Long id, String jobStatus, String handleMessage, long personId) { - return this.baseMapper.cancelAlarm(id) && this.baseMapper.closeJob(id, jobStatus, handleMessage, personId); + boolean cancelAlarm = this.baseMapper.cancelAlarm(id); + this.baseMapper.closeJob(id, jobStatus, handleMessage, personId); + + // 如果关闭工单的条数为0,则返回的值为false + // 取消报警成功与否直接使用cancelAlarm的 + return cancelAlarm; } }