From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmQueryVO.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmQueryVO.java
index 2e4e945..d0e7274 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmQueryVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmQueryVO.java
@@ -62,7 +62,8 @@
vo.setUnitKey(organizationUnitAlarm.getUnitKey());
vo.setShowUnitKey(organizationUnitAlarm.getShowUnitKey());
//alarmLevel Json������������������
- if (!ObjectUtils.isEmpty(organizationUnitAlarm.getAlarmLevel())) {
+ vo.setAlarmLevel(organizationUnitAlarm.getAlarmLevel());
+ /*if (!ObjectUtils.isEmpty(organizationUnitAlarm.getAlarmLevel())) {
StringBuilder alarmLevelStr = new StringBuilder(organizationUnitAlarm.getAlarmLevel());
List<Integer> alarmLevel = new ArrayList<>();
alarmLevelStr.deleteCharAt(0);
@@ -72,7 +73,7 @@
alarmLevel.add(Integer.parseInt(level));
}
vo.setAlarmLevel(alarmLevel);
- }
+ }*/
return vo;
}
--
Gitblit v1.8.0