大屏标点报警接口调整

gassafetyprogress-system/src/main/resources/mapper/system/TDetectorReportDataMapper.xml

@@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             t_detector_report_data rd
         LEFT JOIN t_detector_info di ON rd.detector_code = di.detector_code
         LEFT JOIN t_detector_user u ON u.user_id = di.user_id
-        WHERE u.is_del = '0' and di.is_del = '0'
+        WHERE u.is_del = '0' and di.is_del = '0' and rd.is_cancel_alarm = '0'
         ORDER BY rd.create_time DESC LIMIT 50
     </select>