From 1294081a9cdf9bb4b4523ffc872a4accb5d11144 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Thu, 29 Jun 2023 09:36:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=91=E5=BD=A2=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=80=9A=E9=81=93=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java   | 4 ++--
 1 file 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 421cdad2..bdc45bf2 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 @@ public interface DeviceChannelMapper {
             "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);