From d2cb8a20207a4b45a8fd1553bbf1ff1268e393cb Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Thu, 22 Aug 2024 19:03:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
index 4b54ba2..cbbebf5 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
@@ -662,12 +662,12 @@
//删除测值
list.remove(3);
// 新增
-// boolean save = alarmRecordService.save(alarm);
+ boolean save = alarmRecordService.save(alarm);
// 删除测站编号
list.remove(0);
-// if (save) {
-// return alarm;
-// }
+ if (save) {
+ return alarm;
+ }
}
// 返回
return null;
--
Gitblit v1.9.3