diff --git a/das/src/main/resources/mapper/SysImptabmappingMapper.xml b/das/src/main/resources/mapper/SysImptabmappingMapper.xml index 3cd7e43a..663b6843 100644 --- a/das/src/main/resources/mapper/SysImptabmappingMapper.xml +++ b/das/src/main/resources/mapper/SysImptabmappingMapper.xml @@ -26,7 +26,7 @@ select si.id, se."name" as equipmentName,se.code as equipmentCode, simf.attribute_name as name,si.params,se.id as equipmentId, simf.attribute_code as code 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_field simf on si.equipment_attribute = simf.attribute_code and se.iot_model_id = simf.iot_model_id where si.link_id = #{linkId} and simf.attribute_type = #{type} order by si.porder @@ -35,7 +35,7 @@ select si.id, se."name" as equipmentName,se.code as equipmentCode, sims.service_name as name,si.params,se.id as equipmentId, sims.service_code as code from sys_imptabmapping si left join sys_equipment se on si.equipment_id = se.id - left join sys_iot_model_service sims on si.equipment_service = sims.service_code + 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.link_id = #{linkId} and sims.service_type = #{type} order by si.porder