fix(阅知模块，维修模块): 维修管理排序，阅知报500

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java

@@ -1763,7 +1763,7 @@ public class RepairController {
             }
             //按照时间排序
             List<EquipmentReceivedVo> equipmentReceivedVoList = equipmentReceivedVos.stream().sorted(Comparator.comparing(EquipmentReceivedVo::getUpdateTime)).collect(Collectors.toList());
-            List<EquipmentReceivedVo> finalList = sortMethod2(repairTaskSelectVo.getOrders(), equipmentReceivedVoList, equipmentReceivedVos);
+            List<EquipmentReceivedVo> finalList = sortMethod2(repairTaskSelectVo.getOrders(), equipmentReceivedVos, equipmentReceivedVoList);
             return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(), repairTaskSelectVo.getSize(), finalList, repairTaskSelectVo.getPageable()));
         }
         //已报废装备
@@ -1835,7 +1835,7 @@ public class RepairController {
             //按照时间排序
             List<WaitingRepairEquipmentVo> equipmentReceivedVoList = waitingRepairEquipments.stream().sorted(Comparator.comparing(WaitingRepairEquipmentVo::getUpdateTime)).collect(Collectors.toList());
 //            List<WaitingRepairEquipmentVo> waitingRepairEquipmentVoList = waitingRepairEquipments.stream().sorted(Comparator.comparing(WaitingRepairEquipmentVo::getUpdateTime)).collect(Collectors.toList());
-            List<WaitingRepairEquipmentVo> finalList = sortMethod1(repairTaskSelectVo.getOrders(), equipmentReceivedVoList, waitingRepairEquipments);
+            List<WaitingRepairEquipmentVo> finalList = sortMethod1(repairTaskSelectVo.getOrders(), waitingRepairEquipments, equipmentReceivedVoList);
             return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(), repairTaskSelectVo.getSize(), finalList, repairTaskSelectVo.getPageable()));
         }
         else {
@@ -2420,6 +2420,7 @@ public class RepairController {
         List<WaitingRepairEquipmentVo> finalList = new ArrayList<>();
         boolean b = list.stream().allMatch(Objects::isNull);
         if (b){
+            //默认按照时间排序
             finalList = waitingRepairEquipmentVoList;
         }else {
             finalList = waitingRepairEquipmentVos;

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 -> {