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/resources/mapper/SensorMapper.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/SensorMapper.xml b/screen-manage/src/main/resources/mapper/SensorMapper.xml
index 2e147ef..772c1f1 100644
--- a/screen-manage/src/main/resources/mapper/SensorMapper.xml
+++ b/screen-manage/src/main/resources/mapper/SensorMapper.xml
@@ -85,10 +85,20 @@
code = #{code},
</if>
<if test="upper != null">
- upper = #{upper},
+ <if test="upper == ''">
+ upper = null,
+ </if>
+ <if test="upper != ''">
+ upper = #{upper},
+ </if>
</if>
<if test="lower != null">
- lower = #{lower},
+ <if test="lower == ''">
+ lower = null,
+ </if>
+ <if test="lower != ''">
+ lower = #{lower},
+ </if>
</if>
<if test="default_unit_key != null">
default_unit_key = #{default_unit_key},
--
Gitblit v1.8.0