From 37baece166c1f18dd875d47de350d7598de2aef4 Mon Sep 17 00:00:00 2001
From: shih <510524130@qq.com>
Date: Mon, 11 May 2026 16:28:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E6=80=81=E4=BF=A1=E6=81=AF=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/data/job/SyncDeviceMaintenanceRepairJob.java   |  2 +-
 .../main/resources/mapper/iot/ByManagementJlMapper.xml |  6 ++++--
 .../main/resources/mapper/iot/DevGzbxWxgdMapper.xml    | 10 ++++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lidee-iot-data/src/main/java/iot/lidee/iot/data/job/SyncDeviceMaintenanceRepairJob.java b/lidee-iot-data/src/main/java/iot/lidee/iot/data/job/SyncDeviceMaintenanceRepairJob.java
index 52f2b6b..a4624bd 100644
--- a/lidee-iot-data/src/main/java/iot/lidee/iot/data/job/SyncDeviceMaintenanceRepairJob.java
+++ b/lidee-iot-data/src/main/java/iot/lidee/iot/data/job/SyncDeviceMaintenanceRepairJob.java
@@ -27,6 +27,6 @@ public class SyncDeviceMaintenanceRepairJob {
         
         deviceMaintenanceRepairService.syncDeviceMaintenanceRepairInfo();
         
-        log.info("*********** 开始同步维修保修数据 ************");
+        log.info("*********** 同步维修保修数据结束 ************");
     }
 }
diff --git a/lidee-service/lidee-iot-service/src/main/resources/mapper/iot/ByManagementJlMapper.xml b/lidee-service/lidee-iot-service/src/main/resources/mapper/iot/ByManagementJlMapper.xml
index 9c69901..a259a66 100644
--- a/lidee-service/lidee-iot-service/src/main/resources/mapper/iot/ByManagementJlMapper.xml
+++ b/lidee-service/lidee-iot-service/src/main/resources/mapper/iot/ByManagementJlMapper.xml
@@ -36,8 +36,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             by_management_jl w
                 LEFT JOIN sys_device s ON s.id = w.equipment_info
         WHERE
-            s.dev_type = #{devtype}
-          AND w.is_deleted = 0;
+            w.is_deleted = 0
+            <if test="devtype != null">
+                AND s.dev_type = #{devtype}
+            </if>
     </select>
 
 </mapper>
diff --git a/lidee-service/lidee-iot-service/src/main/resources/mapper/iot/DevGzbxWxgdMapper.xml b/lidee-service/lidee-iot-service/src/main/resources/mapper/iot/DevGzbxWxgdMapper.xml
index fad4f22..0df5fba 100644
--- a/lidee-service/lidee-iot-service/src/main/resources/mapper/iot/DevGzbxWxgdMapper.xml
+++ b/lidee-service/lidee-iot-service/src/main/resources/mapper/iot/DevGzbxWxgdMapper.xml
@@ -51,7 +51,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN
             sys_device s ON s.id = w.dev_name
         WHERE
-            w.dev_type = #{devtype} AND w.is_deleted = 0
+            w.is_deleted = 0
+            <if test="devtype != null">
+                AND w.dev_type = #{devtype}
+            </if>
     </select>
 
     <select id="deviceList"  resultType="iot.lidee.iot.domain.Device">
@@ -62,7 +65,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN
             iot_device_group g ON g.device_id = w.device_id
         WHERE
-            w.del_flag = 0 AND g.group_id = #{devtype}
+            w.del_flag = 0
+            <if test="devtype != null">
+                AND g.group_id = #{devtype}
+            </if>
     </select>