From e21830598f6c55f1196c519fd9005704c82a0fb3 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期三, 30 十二月 2020 15:49:09 +0800
Subject: [PATCH] 修改:idCard改成8位输入或者20位输入,转换大写 原因:扫码扫出8位,数据库和柜子使用的是20位 提出:秦老师

---
 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