|
@@ -259,19 +259,22 @@ public class RepairPersonnelService {
|
|
|
|
|
|
List<RepairFault> repairFaults = repairFaultService.getByRepairId(repairId);
|
|
|
List<Integer> collect = repairFaults.stream().map(RepairFault::getFaultId).collect(Collectors.toList());
|
|
|
-
|
|
|
List<List<Integer>> voList = new ArrayList<>();
|
|
|
- List<Fault> faults = faultService.listByIds(collect);
|
|
|
- for (Fault fault : faults) {
|
|
|
- List<Integer> subList = new ArrayList<>();
|
|
|
- if(fault.getParentId() == null){
|
|
|
- subList.add(fault.getFaultId());
|
|
|
- }else {
|
|
|
- subList.add(fault.getParentId());
|
|
|
- subList.add(fault.getFaultId());
|
|
|
+
|
|
|
+ if(!collect.isEmpty()){
|
|
|
+ List<Fault> faults = faultService.listByIds(collect);
|
|
|
+ for (Fault fault : faults) {
|
|
|
+ List<Integer> subList = new ArrayList<>();
|
|
|
+ if(fault.getParentId() == null){
|
|
|
+ subList.add(fault.getFaultId());
|
|
|
+ }else {
|
|
|
+ subList.add(fault.getParentId());
|
|
|
+ subList.add(fault.getFaultId());
|
|
|
+ }
|
|
|
+ voList.add(subList);
|
|
|
}
|
|
|
- voList.add(subList);
|
|
|
}
|
|
|
+
|
|
|
vo.setFaultIds(voList);
|
|
|
|
|
|
List<RepairRegisterPart> byRepairId = repairRegisterPartService.getByRepairId(repairId);
|