From bb53af6c95d9c73772571b69f7aa9c3a79573da0 Mon Sep 17 00:00:00 2001
From: xiachao <xiachao@qq.com>
Date: Wed, 16 Oct 2024 10:30:07 +0800
Subject: [PATCH] =?UTF-8?q?bug=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/control/IotDeviceControlMapper.xml     | 2 +-
 .../service/impl/IotVisualComponentServiceImpl.java         | 2 +-
 .../group/service/impl/IotVisualGroupServiceImpl.java       | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/thing/src/main/resources/mapper/control/IotDeviceControlMapper.xml b/modules/thing/src/main/resources/mapper/control/IotDeviceControlMapper.xml
index 0c45041..5616e6f 100644
--- a/modules/thing/src/main/resources/mapper/control/IotDeviceControlMapper.xml
+++ b/modules/thing/src/main/resources/mapper/control/IotDeviceControlMapper.xml
@@ -32,7 +32,7 @@
         FROM
             iot_device_control idc
                 LEFT JOIN iot_thing_entity itt ON idc.thing_id = itt.id
-                INNER JOIN iot_thing_dict itd ON idc.attr_id = itd.id
+                INNER JOIN iot_thing_dict_relation itd ON idc.attr_id = itd.id
         <where>
             <if test="ids != null">
                 and idc.id in
diff --git a/modules/visual-design/src/main/java/com/thing/visual/component/service/impl/IotVisualComponentServiceImpl.java b/modules/visual-design/src/main/java/com/thing/visual/component/service/impl/IotVisualComponentServiceImpl.java
index 9511ef6..017be9a 100644
--- a/modules/visual-design/src/main/java/com/thing/visual/component/service/impl/IotVisualComponentServiceImpl.java
+++ b/modules/visual-design/src/main/java/com/thing/visual/component/service/impl/IotVisualComponentServiceImpl.java
@@ -99,7 +99,7 @@ public class IotVisualComponentServiceImpl extends BaseServiceImpl<IotVisualComp
     public List<GroupInfo> businessList() {
         Long  tenantCode =  UserContext.getTenantCode();
         QueryWrapper wrapper = new QueryWrapper();
-        wrapper.eq("name","远程组件");
+        wrapper.eq("name","远程");
         wrapper.and(IOT_VISUAL_GROUP_ENTITY.TENANT_CODE.eq(tenantCode).or(IOT_VISUAL_GROUP_ENTITY.IS_DEFAULT.eq("1")));
         wrapper.orderBy("bs_sort",true);
 
diff --git a/modules/visual-design/src/main/java/com/thing/visual/group/service/impl/IotVisualGroupServiceImpl.java b/modules/visual-design/src/main/java/com/thing/visual/group/service/impl/IotVisualGroupServiceImpl.java
index a0dc084..add7382 100644
--- a/modules/visual-design/src/main/java/com/thing/visual/group/service/impl/IotVisualGroupServiceImpl.java
+++ b/modules/visual-design/src/main/java/com/thing/visual/group/service/impl/IotVisualGroupServiceImpl.java
@@ -128,7 +128,11 @@ public class IotVisualGroupServiceImpl extends BaseServiceImpl<IotVisualGroupMap
                     .from(IOT_VISUAL_GROUP_ENTITY).eq(IotVisualGroupEntity::getType,type);
             wrapper.and(IOT_VISUAL_GROUP_ENTITY.TENANT_CODE.eq(tenantCode).or(IOT_VISUAL_GROUP_ENTITY.IS_DEFAULT.eq("1")));
             GroupSortInfo maxSort = this.mapper.selectOneByQueryAs(wrapper,GroupSortInfo.class);
-            sortInfo.setSort(maxSort.getSort()+1);
+            try {
+                sortInfo.setSort(maxSort.getSort()+1);
+            } catch (Exception e) {
+                sortInfo.setSort(1);
+            }
 
             return sortInfo;
         }