diff --git a/zc-business/src/main/java/com/zc/business/controller/DcEventProcessController.java b/zc-business/src/main/java/com/zc/business/controller/DcEventProcessController.java index 00cb1f23..4b0317f4 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcEventProcessController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcEventProcessController.java @@ -112,13 +112,13 @@ public class DcEventProcessController extends BaseController } } if (dcEvent.getEventType() == 1 || dcEvent.getEventType() == 2 || dcEvent.getEventType() == 6){ - if (dcEventProcess.getProcessId() == 3) { + if (dcEventProcess.getProcessId() != null && dcEventProcess.getProcessId() == 3) { //中间库 更新清障到达时间 MdEvent mdEvent = new MdEvent(); mdEvent.setFusionId(dcEventProcess.getEventId()); mdEvent.setClearArriveTime(new Date()); middleDatabaseService.updateMiddleDatabaseEvent(mdEvent); - } else if (dcEventProcess.getProcessId() == 6){ + } else if (dcEventProcess.getProcessId() != null && dcEventProcess.getProcessId() == 6){ //中间库 更新清障结束时间 MdEvent mdEvent = new MdEvent(); mdEvent.setFusionId(dcEventProcess.getEventId());