From d6a0a1bb4c7b27a6521c969046cb969b168fa93a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 07 Jun 2021 10:11:08 +0800
Subject: [PATCH] screen-manage 更新组织删除逻辑，存在站点或者子组织存在站点则无法删除。
---
screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java
index 1bc7352..85d4ae1 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java
@@ -87,9 +87,11 @@
private static SensorVO convertToSensorVO(Sensor sensor) {
SensorVO vo = new SensorVO();
vo.setName(sensor.getName());
- vo.setCode(sensor.getCode());
+ vo.setId(sensor.getId());
vo.setUnit(sensor.getUnit());
- vo.getUnitKey();
+ vo.setUpper(sensor.getUpper());
+ vo.setLower(sensor.getLower());
+ vo.setUnitKey(sensor.getUnitKey());
return vo;
}
}
--
Gitblit v1.8.0