合并分支 'bug' 到 'master'

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

@@ -1654,8 +1654,6 @@ public class RepairController {
             //发起送修的单位为当前单位  并且所在单位不是自己的
 //          //进行时间上面的优化
             List<Integer> sendRepairIds = repairDetails1.stream().map(RepairDetail::getDeviceRepairBillId).collect(Collectors.toList());
-            //通过id去查询
-//            List<String> sendUnits = deviceRepairBillService.findByIds(sendRepairIds).stream().map(RepairBill::getSendUnit).distinct().collect(Collectors.toList());
             //key为发起单位
             Map<String, List<RepairBill>> listMap = deviceRepairBillService.findByIds(sendRepairIds).stream().collect(Collectors.groupingBy(RepairBill::getSendUnit));
             List<RepairBill> repairBills = listMap.get(unitName);
@@ -1752,7 +1750,7 @@ public class RepairController {
                 }
                 if (repairDetail.getDeviceRepairBillId() != null){
                     TaskBto taskBto1 = taskService.getParentTaskIsNull(repairDetail.getDeviceRepairBillId(), 5);
-                    if (taskUserVo1!=null){
+                    if (taskBto1 != null){
                         taskUserVo1 = taskBto1.toVo();
                     }
                 }
@@ -2401,7 +2399,7 @@ public class RepairController {
         });
     }
 
-    private List<RepairDetail> sortMethod(List<CustomOrder> orders,List<RepairDetail> repairDetails2,List<RepairDetail> repairDetails1){
+    private List<RepairDetail> sortMethod(List<CustomOrder> orders, List<RepairDetail> repairDetails2, List<RepairDetail> repairDetails1){
 //        List<CustomOrder> orders = repairTaskSelectVo.getOrders();
         List<String> list = orders.stream().map(CustomOrder::getDirection).collect(Collectors.toList());
 //        List<RepairDetail> repairDetails2 = repairDetails1.stream().sorted(Comparator.comparing(RepairDetail::getUpdateTime)).collect(Collectors.toList());
@@ -2415,7 +2413,7 @@ public class RepairController {
         return  finalList;
     }
 
-    private List<WaitingRepairEquipmentVo> sortMethod1(List<CustomOrder> orders,List<WaitingRepairEquipmentVo> waitingRepairEquipmentVos,List<WaitingRepairEquipmentVo> waitingRepairEquipmentVoList){
+    private List<WaitingRepairEquipmentVo> sortMethod1(List<CustomOrder> orders, List<WaitingRepairEquipmentVo> waitingRepairEquipmentVos, List<WaitingRepairEquipmentVo> waitingRepairEquipmentVoList){
         List<String> list = orders.stream().map(CustomOrder::getDirection).collect(Collectors.toList());
         List<WaitingRepairEquipmentVo> finalList = new ArrayList<>();
         boolean b = list.stream().allMatch(Objects::isNull);
@@ -2439,6 +2437,7 @@ public class RepairController {
         }else {
             finalList = equipmentReceivedVos;
         }
+
         return  finalList;
     }