1

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

@@ -258,10 +258,21 @@ public class RepairPersonnelService {
 
         List<RepairFault> repairFaults = repairFaultService.getByRepairId(repairId);
         List<Integer> collect = repairFaults.stream().map(RepairFault::getFaultId).collect(Collectors.toList());
-        if(!collect.isEmpty()){
-            vo.setFaultIds(Arrays.asList(collect));
-        }else {
-            vo.setFaultIds(Arrays.asList(collect));
+        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());
+                }
+            }
+            voList.add(newList);
         }
 
         List<RepairRegisterPart> byRepairId = repairRegisterPartService.getByRepairId(repairId);