From 136d22c6c5810ed3e8e98727583a6a812d08ecd2 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期五, 12 八月 2022 14:13:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hylywcs' into hylywcs
---
src/main/java/com/zy/asrs/controller/SiteController.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index fdeb421..e0aba4d 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -159,6 +159,11 @@
for (Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
if (siteId.equals(entry.getKey())) {
StaProtocol staProtocol = entry.getValue();
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
if (workNo != null) {
staProtocol.setWorkNo(workNo);
}
--
Gitblit v1.9.1