fix(维修模块): 维修管理已领取出现500

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

@@ -1776,7 +1776,12 @@ public class RepairController {
             List<String> units = unitsService.findSuperiorUnitsList().stream().map(Units::getName).collect(Collectors.toList());
             units.addAll(unitsService.findBySubordinateNotOneself(userUtils.getCurrentUnitId()).stream().map(Units::getName).collect(Collectors.toList()));
             //所在单位在当前单位下级的
-            List<RepairDetail> repairDetails2 = repairDetails.stream().filter(repairDetail -> units.contains(repairDetail.getLocationUnit()) && (!hasYear || repairDetail.getUpdateTime().getYear() == year - 1900)).collect(Collectors.toList());
+//            List<RepairDetail> repairDetails2 = repairDetails.stream().filter(repairDetail -> units.contains(repairDetail.getLocationUnit()) && (!hasYear || repairDetail.getUpdateTime().getYear() == year - 1900)).collect(Collectors.toList());
+            List<RepairDetail> repairDetails2 = repairDetails.stream()
+                    .filter(repairDetail -> units.contains(repairDetail.getLocationUnit())
+                            && (!hasYear || repairDetail.getUpdateTime().getYear() == year - 1900))
+                    .filter(repairDetail -> repairDetail.getRepairBackBillId()!=null)
+                    .collect(Collectors.toList());
             List<EquipmentReceivedVo> equipmentReceivedVos = new ArrayList<>();
             TaskUserVo taskUserVo = null;
             TaskUserVo taskUserVo1 = null;
@@ -1787,7 +1792,7 @@ public class RepairController {
                         taskUserVo = taskBto.toVo();
                     }
                 }
-                if (repairDetail.getDeviceRepairBillId() != null){
+                if (repairDetail.getDeviceRepairBillId() != null && repairDetail.getDeviceRepairBillId() !=0){
                     TaskBto taskBto1 = taskService.getParentTaskIsNull(repairDetail.getDeviceRepairBillId(), 5);
                     if (taskBto1 != null){
                         taskUserVo1 = taskBto1.toVo();