中心现场告警列表翻页、过滤了无系统数据等问题

amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml

@@ -1530,7 +1530,8 @@
         LEFT JOIN wl_equipment_specific wes ON wes.id = wlesa.equipment_specific_id
         LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET(fs.id, wlesa.system_ids)
         <where>
-            fs.system_type_code IS NOT NULL
+             -- fs.system_type_code IS NOT NULL
+            1 = 1
             <if test="bizOrgCode != null and bizOrgCode != ''">
                 and wlesa.biz_org_code like concat(#{bizOrgCode},'%')
             </if>
@@ -1541,7 +1542,7 @@
                 AND wlesa.create_date >= DATE_FORMAT( #{startDate}, '%Y-%m-%d %H:%i:%s' )
             </if>
             <if test="endDate != null and endDate != ''">
-                AND DATE_FORMAT( #{endDate}, '%Y-%m-%d %H:%i:%s' ) >= wlesal.create_date
+                AND DATE_FORMAT( #{endDate}, '%Y-%m-%d %H:%i:%s' ) >= wlesa.create_date
             </if>
             <if test="systemCode != null and systemCode != ''">
                 and fs.code = #{systemCode}

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -6988,7 +6988,8 @@
                     wl_equipment_specific_alarm_log r
                     LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET( fs.id, r.system_ids )
                 <where>
-                    fs.system_type_code IS NOT NULL
+                    -- fs.system_type_code IS NOT NULL
+                    1 = 1
                     <if test="systemCode != null and systemCode != ''">
                         AND fs.`code` = #{systemCode}
                     </if>