异物侵限报警修改

business-service/src/main/resources/mapper/service/MsgAlarmMatterMapper.xml

@@ -36,7 +36,7 @@
                 and source = #{source}
             </if>
         </where>
-        order by  alarm_time desc
+        order by is_release desc, alarm_time desc
     </select>
 
 </mapper>

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmMatterController.java

@@ -177,9 +177,9 @@ public class MsgAlarmMatterController extends BaseController {
                 }
             });
 
-            ExcelUtil<MsgAlarmMatter> util = new ExcelUtil<>(MsgAlarmMatter.class);
-            util.exportExcel(response, msgAlarmList, "报警信息管理");
         }
+        ExcelUtil<MsgAlarmMatter> util = new ExcelUtil<>(MsgAlarmMatter.class);
+        util.exportExcel(response, msgAlarmList, "异物侵限报警信息管理");
     }
 }