修改告警监测告警数据查询

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

@@ -1496,10 +1496,10 @@
         <if test="sortField != null and sortField != ''">
             <choose>
                 <when test="sortOrder == 'ascend'">
-                    wlesal.@SORT_FIELD ASC
+                    @SORT_FIELD ASC
                 </when>
                 <otherwise>
-                    wlesal.@SORT_FIELD DESC
+                    @SORT_FIELD DESC
                 </otherwise>
             </choose>
         </if>

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

@@ -6858,6 +6858,7 @@
                     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
                     <if test="systemCode != null and systemCode != ''">
                         AND fs.`code` = #{systemCode}
                     </if>