change - modeId写错了，应为deviceModeId

ruoyi-modules/hw-business/src/main/resources/mapper/business/HwDeviceMapper.xml

@@ -446,7 +446,7 @@ select a.device_mode_name,sum(a.sum) sum from  (select
     </select>
     <select id="getDeviceByModel" resultType="com.ruoyi.business.domain.HwDevice"
             parameterType="java.lang.Long">
-        select * from hw_device where device_mode_id = #{modelId}
+        select * from hw_device where device_mode_id = #{deviceModeId}
     </select>
 
     <select id="selectDeviceList"  resultMap="TreeDeviceVoResult">

ruoyi-modules/hw-business/src/main/resources/mapper/business/HwElectronicFenceMapper.xml

@@ -260,6 +260,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         hs.scene_name
         from hw_electronic_fence hef
         left join hw_scene hs on hef.scene_id = hs.scene_id
+        left join hw_fence_target hft on hft.electronic_fence_id = hef.electronic_fence_id
+        left join hw_device_mode hdm on hdm.device_mode_id = hef.device_mode_id
+        left join hw_device hd on hd.device_id = hef.device_id
         <where>
             hef.trigger_status !='9'
             <if test="electronicFenceName != null  and electronicFenceName != ''"> and hef.electronic_fence_name like concat('%', #{electronicFenceName}, '%')</if>