From 7e0bfd55386f7a3cbadb5776daa523928ff6f0f4 Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Wed, 17 Jul 2024 09:53:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=BD=AE=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zc/business/controller/DcEventProcessController.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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());