Merge remote-tracking branch 'origin/develop_dl_plan6_temp' into develop_dl_plan6_temp

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

@@ -499,11 +499,12 @@
         si.update_date,
         si.equipment_index_key,
         si.equipment_specific_name,
-        es.position location,
+        CONCAT_WS('-', es.position, wled.area) AS location, /*告警列表拼接详细地址*/
         es.`iot_code` AS iotCode
         FROM
         wl_equipment_specific_index si
         LEFT JOIN wl_equipment_specific es ON si.equipment_specific_id = es.id
+        LEFT JOIN wl_equipment_detail wled ON es.equipment_detail_id = wled.id
         <where>
             <if test="list != null and list.size > 0 and type = 'id'">
                 si.equipment_index_key  IN

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

@@ -759,7 +759,6 @@
             <if test='equipmentId != null'>
                 and wlesal.equipment_id=#{equipmentId}
             </if>
-            and wlesal.status = true
         </where>
         ) d
         <where>