修改特种设备智慧监管平台首页，消息提醒列表排序错误

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/MsgLogController.java

@@ -15,8 +15,11 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 消息流水表
@@ -150,7 +153,12 @@ public class MsgLogController extends BaseController {
         Page<MsgLogDto> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(msgLogServiceImpl.queryForMsgLogByTerminalTypePage(page, terminalType, isRead, sendTimeStart, sendTimeEnd, msgType, body));
+        Page<MsgLogDto> msgLogDtoPage = msgLogServiceImpl.queryForMsgLogByTerminalTypePage(page, terminalType, isRead, sendTimeStart, sendTimeEnd, msgType, body);
+        List<MsgLogDto> records = msgLogDtoPage.getRecords( );
+        List<MsgLogDto> collect = records.stream( ).sorted(Comparator.comparing(MsgLogDto::getSendTime, Comparator.nullsLast(Comparator.reverseOrder( ))))
+                .filter(b -> b.getIsDelete( )).collect(Collectors.toList( ));
+        msgLogDtoPage.setRecords(collect);
+        return ResponseHelper.buildResponse(msgLogDtoPage);
     }
 
     /**