lyhzzz 6 meses atrás
pai
commit
6a6972cc92

+ 10 - 1
src/main/java/com/fdkankan/sale/service/impl/RepairPersonnelService.java

@@ -63,6 +63,8 @@ public class RepairPersonnelService {
     IRepairRegisterLogService repairRegisterLogService;
     @Autowired
     RepairSupplyService repairSupplyService;
+    @Autowired
+    IFaultService faultService;
 
 
 
@@ -259,7 +261,14 @@ public class RepairPersonnelService {
 
         List<RepairFault> repairFaults = repairFaultService.getByRepairId(repairId);
         List<Integer> collect = repairFaults.stream().map(RepairFault::getFaultId).collect(Collectors.toList());
-        vo.setFaultIds(collect);
+        if(!collect.isEmpty()){
+            List<Fault> faults = faultService.listByIds(collect);
+            List<Integer> parentIds = faults.stream().map(Fault::getParentId).collect(Collectors.toList());
+            parentIds.addAll(collect);
+            vo.setFaultIds(parentIds);
+        }else {
+            vo.setFaultIds(collect);
+        }
 
         List<RepairRegisterPart> byRepairId = repairRegisterPartService.getByRepairId(repairId);
         HashMap<Integer, Part> hashMap = partService.getHashMap();