From 86c06b0f6f30099b436814ab223121aa8239081a Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 16 Sep 2021 10:14:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
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