From 6cacc83c962b0b9f2bf8277a09c8812d2e957e45 Mon Sep 17 00:00:00 2001
From: "review512jwy@163.com" <“review512jwy@163.com”>
Date: Fri, 15 May 2026 14:39:33 +0800
Subject: [PATCH] =?UTF-8?q?F10=E5=91=8A=E8=AD=A6=E4=B9=9F=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mappers/ex/DeviceInfoMapperExt.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
index 6b5aa8d..bd57eb0 100644
--- a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
+++ b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
@@ -315,12 +315,12 @@
                     PARTITION BY device_id
                     ORDER BY receive_ts DESC
                     ) AS rn
-                    FROM alert_history where alert_history.source_type = 1
+                    FROM alert_history
                  ) alert_history on alert_history.device_id = device_info.device_id AND alert_history.rn = 1
             </when>
             <otherwise>
                 alert_history
-                left join device_info on alert_history.device_id = device_info.device_id and alert_history.source_type = 1
+                left join device_info on alert_history.device_id = device_info.device_id
             </otherwise>
         </choose>
         left join basic_monitoring_asset on device_info.asset_id = basic_monitoring_asset.equipment_id
@@ -375,12 +375,12 @@
                 PARTITION BY device_id
                 ORDER BY receive_ts DESC
                 ) AS rn
-                FROM alert_history where alert_history.source_type = 1
+                FROM alert_history
                 ) alert_history on alert_history.device_id = device_info.device_id AND alert_history.rn = 1
             </when>
             <otherwise>
                 alert_history
-                left join device_info on alert_history.device_id = device_info.device_id and alert_history.source_type = 1
+                left join device_info on alert_history.device_id = device_info.device_id
             </otherwise>
         </choose>
         left join basic_monitoring_asset on device_info.asset_id = basic_monitoring_asset.equipment_id