From bb7ce41d7525f369a93c8b6f76a05fb90d1031b2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 28 十二月 2020 17:50:58 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 3e53f03..e13dc95 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -728,6 +728,9 @@
                     if (latest == null) {
                         if (crnProtocol.getAlarm1() != null && crnProtocol.getAlarm1() > 0) {
                             WrkMast wrkMast = wrkMastMapper.selectById(crnProtocol.getTaskNo());
+                            if (wrkMast == null) {
+                                continue;
+                            }
                             BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
                             BasErrLog basErrLog = new BasErrLog(
                                     null,    // 缂栧彿

--
Gitblit v1.9.1