diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsTicketServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsTicketServiceImpl.java index 8e41617..e8843af 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsTicketServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsTicketServiceImpl.java @@ -85,10 +85,10 @@ public class EmsTicketServiceImpl implements IEmsTicketService @Override public int updateEmsTicket(EmsTicket emsTicket) { - String status = emsTicket.getStatus().toString(); + String status = emsTicket.getStatus() == null ? "" : emsTicket.getStatus().toString(); String ticketNo = emsTicket.getTicketNo(); // 判断工单状态为:3-已完成 - if ("3".equals(status) && !StringUtils.isEmpty(ticketNo)) { + if (!StringUtils.isEmpty(status) && "3".equals(status) && !StringUtils.isEmpty(ticketNo)) { // 处理告警数据状态-已处理 EmsAlarmRecords emsAlarmRecords = emsAlarmRecordsMapper.getAlarmByTicketNo(ticketNo); if (emsAlarmRecords != null) {