1

src/main/java/com/fdkankan/sale/service/impl/RepairPersonnelService.java

@@ -258,22 +258,20 @@ public class RepairPersonnelService {
 
         List<RepairFault> repairFaults = repairFaultService.getByRepairId(repairId);
         List<Integer> collect = repairFaults.stream().map(RepairFault::getFaultId).collect(Collectors.toList());
-        vo.setFaultIds(Arrays.asList(collect));
 
         List<List<Integer>> voList = new ArrayList<>();
-        for (List<Integer> faultId : vo.getFaultIds()) {
-            List<Integer> newList = new ArrayList<>();
-            for (Integer subId : faultId) {
-                Fault byId = faultService.getById(subId);
-                if(byId.getParentId() !=null){
-                    newList.add(byId.getParentId());
-                    newList.add(byId.getFaultId());
-                }else {
-                    newList.add(byId.getFaultId());
-                }
+        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(newList);
+            voList.add(subList);
         }
+        vo.setFaultIds(voList);
 
         List<RepairRegisterPart> byRepairId = repairRegisterPartService.getByRepairId(repairId);
         HashMap<Integer, Part> hashMap = partService.getHashMap();