From db2b30bbe239427a89521cd858b2b191d56086ef Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 14 Sep 2021 09:41:06 +0800
Subject: [PATCH] 获取有走航车数据日期,device修改,绑定国控站

---
 screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java
index 112117f..f235c31 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java
@@ -76,11 +76,17 @@
         OrganizationUnitAlarm oldRecord = organizationUnitAlarmMapper.selectById(organizationUnitAlarm.getId());
         //������
         UpdateWrapper updateWrapper = new UpdateWrapper();
-        if(organizationUnitAlarm.getAlarmLevel().equals(""))
+
+        if(organizationUnitAlarm.getAlarmLevel().equals("[]"))
             updateWrapper.set("alarm_level",null);
+        else
+            updateWrapper.set("alarm_level",organizationUnitAlarm.getAlarmLevel());
+
         if(organizationUnitAlarm.getShowUnitKey()!=null)
             updateWrapper.set("show_unit_key",organizationUnitAlarm.getShowUnitKey());
+
         updateWrapper.eq("id",organizationUnitAlarm.getId());
+
         organizationUnitAlarmMapper.update(null,updateWrapper);
         //������������������������������������������
         OrganizationUnitAlarm newRecord = organizationUnitAlarmMapper.selectById(organizationUnitAlarm.getId());

--
Gitblit v1.8.0