修改bug

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

@@ -2521,29 +2521,35 @@
 <!--        LIMIT 5-->
 
         SELECT
-        a.equipName,
-        count( DISTINCT wesa.equipment_specific_id ) AS total
+            d.*
         FROM
         (
-        SELECT
-        eq.`name` AS equipName,
-        eq.id AS equipmentId,
-        eq.`code` AS `code`
-        FROM
-        wl_equipment eq
-        LEFT JOIN wl_equipment_detail wed ON eq.id = wed.equipment_id
-        LEFT JOIN wl_equipment_specific wes ON wed.id = wes.equipment_detail_id
-        WHERE
-        FIND_IN_SET( #{systemId}, wes.system_id ) > 0
-        ) a
-        LEFT JOIN wl_equipment_specific_alarm wesa ON wesa.equipment_id = a.equipmentId
-        AND FIND_IN_SET( #{systemId}, wesa.system_ids ) > 0
-        AND `wesa`.`create_date` >= ( curdate() - INTERVAL 30 DAY )
-        GROUP BY
-        a.equipmentId
-        ORDER BY
-        total DESC
-        LIMIT 5
+            SELECT
+            a.equipName,
+            count( DISTINCT wesa.equipment_specific_id ) AS total
+            FROM
+            (
+            SELECT
+            eq.`name` AS equipName,
+            eq.id AS equipmentId,
+            eq.`code` AS `code`
+            FROM
+            wl_equipment eq
+            LEFT JOIN wl_equipment_detail wed ON eq.id = wed.equipment_id
+            LEFT JOIN wl_equipment_specific wes ON wed.id = wes.equipment_detail_id
+            WHERE
+            FIND_IN_SET( #{systemId}, wes.system_id ) > 0
+            ) a
+            LEFT JOIN wl_equipment_specific_alarm wesa ON wesa.equipment_id = a.equipmentId
+            AND FIND_IN_SET( #{systemId}, wesa.system_ids ) > 0
+            AND `wesa`.`create_date` >= ( curdate() - INTERVAL 30 DAY )
+            GROUP BY
+            a.equipmentId
+            ORDER BY
+            total DESC
+            LIMIT 5
+        ) d
+        ORDER BY d.total ASC
     </select>
 
     <select id="equipmentId" resultType="String">
@@ -2552,8 +2558,7 @@
         from
             f_fire_fighting_system
         where
-            code = #{systemCode} and
-            biz_org_code like concat(#{bizOrgCode}, '%')
+            code = #{systemCode}
     </select>
 
     <select id="equipmentState" resultType="java.util.Map">