From fda4fbd2539b692969908238fc482efab88690ad Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期三, 16 十二月 2020 16:55:44 +0800
Subject: [PATCH] 模块：实验室临时存储管理 修改：新增和修改的课题选项 提出：秦老师 注意: 新增字段sys_laboratory_controller(project_id)
---
src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
index 0ea9cfe..081911c 100644
--- a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
@@ -1419,7 +1419,8 @@
content += "柜门未关";
}
//给daping系统发送信息
- if("1".equals(warningId) || "2".equals(warningId)|| "6".equals(warningId)) {
+
+ if(!"".equals(alarmUrl) && ("1".equals(warningId) || "2".equals(warningId)|| "6".equals(warningId)) ) {
JSONObject json = new JSONObject();
json.put("barCode", location.get("barCode"));
json.put("type", alarmType);
--
Gitblit v1.9.2