From ff7ecd270c7d0b2cd1dd2ec078df0dbe62aad08d Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期四, 21 一月 2021 09:24:58 +0800 Subject: [PATCH] Merge pull request #43 from lawrencehj/master --- src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 1 + 1 files changed, 1 insertions(+), 0 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 57dc96d..11b728a 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 @@ -59,6 +59,7 @@ " WHERE 1=1 " + " <if test=\"hasSubChannel == true\" > AND subCount >0</if>" + " <if test=\"hasSubChannel == false\" > AND subCount=0</if>" + + " ORDER BY channelId ASC" + " </script>"}) List<DeviceChannel> queryChannelsByDeviceId(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, Boolean online); -- Gitblit v1.8.0