From f34eb9c9e6b61b596d0085e9a2baec48628b23e1 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: Thu, 14 Jan 2021 23:53:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E9=81=93=E6=9F=A5=E8=AF=A2=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E8=BE=93=E5=87=BA=EF=BC=8C=E9=81=BF=E5=85=8D=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=82=E4=B9=B1=E6=97=A0=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 2 ++
 1 file changed, 2 insertions(+)

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 5c871bdc..6d3b031b 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
@@ -63,6 +63,7 @@ public interface DeviceChannelMapper {
             " 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);
 
@@ -96,6 +97,7 @@ public interface DeviceChannelMapper {
             " <if test=\"hasSubChannel!= null and hasSubChannel == false\" >  AND subCount=0</if> " +
             " <if test=\"platformId != null and inPlatform == true \" >  AND platformId='${platformId}'</if> " +
             " <if test=\"platformId != null and inPlatform == false \" >  AND (platformId != '${platformId}' OR platformId is NULL )  </if> " +
+            " ORDER BY deviceId, channelId ASC" +
             " </script>"})
 
     List<ChannelReduce> queryChannelListInAll(String query, Boolean online, Boolean hasSubChannel, String platformId, Boolean inPlatform);