From d05e13f6c60448d9e44973e01bebdf1600b54e50 Mon Sep 17 00:00:00 2001
From: zangch <zch0103@yeah.net>
Date: Wed, 4 Sep 2024 10:20:03 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20modeId=E5=86=99=E9=94=99=E4=BA=86?=
 =?UTF-8?q?=EF=BC=8C=E5=BA=94=E4=B8=BAdeviceModeId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/business/HwDeviceMapper.xml      | 2 +-
 .../main/resources/mapper/business/HwElectronicFenceMapper.xml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwDeviceMapper.xml b/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwDeviceMapper.xml
index fa38cd3..a1f7f2d 100644
--- a/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwDeviceMapper.xml
+++ b/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">
diff --git a/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwElectronicFenceMapper.xml b/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwElectronicFenceMapper.xml
index e693955..192a59c 100644
--- a/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwElectronicFenceMapper.xml
+++ b/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>