From 403810ccd68dedf1d93c4ad9e10b4f0de8eec8f8 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Tue, 05 Jan 2021 18:03:11 +0800
Subject: [PATCH] 修改：把危化品编码得memo加入到试剂表中字段reagent_character危险性质 目的：库存得时候显示危险信息 提出：秦老师
---
src/main/java/com/nanometer/smartlab/service/SysWarningServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysWarningServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysWarningServiceImpl.java
index 55bc3da..e593e8d 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysWarningServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysWarningServiceImpl.java
@@ -84,7 +84,7 @@
params.put("id", selectedWarning.getId());
//给大屏信息发送处理信息
//页面只允许修改完成转台
- if (StringUtils.isNotBlank(selectedWarning.getAlarmId())){
+ if (StringUtils.isNotBlank(selectedWarning.getAlarmId()) && StringUtils.isNotBlank(alarmUrl)){
JSONObject json=new JSONObject();
json.put("dataType", "data");
json.put("id", selectedWarning.getAlarmId());
--
Gitblit v1.9.2