From c014a90cc6a294dfc2aac740be87e75f44193a29 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 29 六月 2023 16:08:05 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
index 421cdad..bdc45bf 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
@@ -459,8 +459,8 @@
"select * " +
"from wvp_device_channel " +
"where device_id=#{deviceId}" +
- " <if test='parentId != null '> and parent_id = #{parentId} </if>" +
- " <if test='parentId == null '> and parent_id is null </if>" +
+ " <if test='parentId != null and parentId != deviceId'> and parent_id = #{parentId} </if>" +
+ " <if test='parentId == null or parentId == deviceId'> and parent_id is null or parent_id = #{deviceId}</if>" +
" <if test='onlyCatalog == true '> and parental = 1 </if>" +
" </script>"})
List<DeviceChannel> getSubChannelsByDeviceId(String deviceId, String parentId, boolean onlyCatalog);
--
Gitblit v1.8.0