fix(版本回滚合并): 版本回滚合并

dev-repair/src/main/java/com/tykj/dev/device/repair/repository/RepairDetailDao.java

@@ -35,4 +35,6 @@ public interface RepairDetailDao extends JpaRepository<RepairDetail, Integer>, J
     @Modifying
     @Query("update RepairDetail r set r.record3 = :record where r.id = :id")
     void updateRecord3(String record,Integer id);
+
+    List<RepairDetail> findAllByIdIn(List<Integer> ids);
 }

dev-user/src/main/java/com/tykj/dev/device/user/read/controller/MessageController.java

@@ -60,7 +60,7 @@ public class MessageController {
         Boolean hasContentDim = messageSelectVo.getContentDim()!=null;
         Boolean hasOperatorDim = messageSelectVo.getOperatorDim()!=null;
         List<MessageUserVo> messageUserVos = messageService.getAllList(messageSelectVo);
-        messageUserVos.sort(Comparator.comparing(MessageUserVo::getIsTop).reversed().thenComparing(MessageUserVo::getCreateTime).reversed());
+//        messageUserVos.sort(Comparator.comparing(MessageUserVo::getIsTop).reversed().thenComparing(MessageUserVo::getCreateTime).reversed());
         //模糊查询筛选
         if (hasContentDim||hasOperatorDim) {
             messageUserVos = messageUserVos.stream().filter(messageUserVo -> {