From 32878aa152e6380ce547b7836a44718928a4f7a3 Mon Sep 17 00:00:00 2001
From: chenhaojie <hjchencq@isoftstone.com>
Date: Fri, 18 Oct 2024 16:14:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=A6=E9=98=B3=E9=A1=B9=E7=9B=AE=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5=E5=92=8C?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 das/src/main/resources/mapper/SysImptabmappingMapper.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/das/src/main/resources/mapper/SysImptabmappingMapper.xml b/das/src/main/resources/mapper/SysImptabmappingMapper.xml
index 663b6843..b9d0337d 100644
--- a/das/src/main/resources/mapper/SysImptabmappingMapper.xml
+++ b/das/src/main/resources/mapper/SysImptabmappingMapper.xml
@@ -61,8 +61,8 @@
     <select id="getIotModelFieldByEquipmentId" resultType="com.das.modules.node.domain.vo.IotModelVo">
         select simf.attribute_type as attributeType,sims.service_type as serviceType, se.iot_addr as iotAddr,si.equipment_attribute as equipmentAttribute,si.equipment_service as equipmentService, si.params, simf.highspeed as highSpeed from sys_imptabmapping si
         left join sys_equipment se on si.equipment_id = se.id
-        left join sys_iot_model_field simf on si.equipment_attribute  = simf.attribute_code
-        left join sys_iot_model_service sims on si.equipment_service  = sims.service_code
+        left join sys_iot_model_field simf on si.equipment_attribute  = simf.attribute_code and se.iot_model_id = simf.iot_model_id
+        left join sys_iot_model_service sims on si.equipment_service  = sims.service_code and se.iot_model_id = sims.iot_model_id
         where si.equipment_id = #{equipmentId}
     </select>