diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java index 8e2d223..f9e79a4 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java @@ -125,6 +125,7 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService { // 根据订单id查询订单详情 List list = mapper.getLeaseRepairRecordList(dto); if (CollectionUtils.isNotEmpty(list)) { + List fileList = new ArrayList<>(); for (LeaseRepairRecord leaseRepairRecord : list) { if (leaseRepairRecord.getRepairChangePrice() != null || leaseRepairRecord.getScrapChangePrice() != null || leaseRepairRecord.getLossChangePrice() != null) { @@ -148,10 +149,7 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService { BmFileInfo bmFileInfo = new BmFileInfo(); bmFileInfo.setModelId(Long.valueOf(leaseRepairRecord.getMaId())); bmFileInfo.setTaskType(MaterialConstants.LEASE_REPAIR_RECORD_TABLE_NAME); - List fileList = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo); - if (CollectionUtils.isNotEmpty(fileList)) { - leaseRecordDto.setFileInfoList(fileList); - } + fileList.addAll(bmFileInfoMapper.selectBmFileInfoList(bmFileInfo)); if (leaseRecordDto.getRepairRecordList() == null) { leaseRecordDto.setRepairRecordList(new ArrayList<>()); } @@ -171,6 +169,9 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService { leaseRecordDto.getLossRecordList().add(leaseRepairRecord); } } + if (CollectionUtils.isNotEmpty(fileList)) { + leaseRecordDto.setFileInfoList(fileList); + } } leaseRecordDto.setTotalCost(totalCost); return leaseRecordDto;