From 3403a2462434da327d89311b4b9a75ab7a9b5c0f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 07 十一月 2024 18:38:22 +0800
Subject: [PATCH] OSD宇视bug，工单删除、工单导出时间bug等等
---
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
index 1ef0de4..32b9f2c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
@@ -134,7 +134,7 @@
for (TMonitorVO monitor : monitors) {
if (!CollectionUtils.isEmpty(voList)) {
for (WorkOrderVO workOrderVO : voList) {
- if (monitor.getWorkOrderNo().equals(workOrderVO.getWorkOrderNo())) {
+ if (monitor.getWorkOrderNo()!=null && monitor.getWorkOrderNo().equals(workOrderVO.getWorkOrderNo())) {
monitor.setUnitContact(workOrderVO.getUnitContact());
monitor.setUnitContactPhone(workOrderVO.getUnitContactPhone());
monitor.setYwPeopleName(workOrderVO.getYwPeopleName());
--
Gitblit v1.8.0