|
|
@@ -156,10 +156,12 @@ public class DetectionFileServiceImpl extends ServiceImpl<DetectionFileMapper, D
|
|
|
for (DetectionFilePO record : records) {
|
|
|
DetectionFileDTO detectionFileDTO = new DetectionFileDTO();
|
|
|
BeanUtils.copyProperties(record, detectionFileDTO);
|
|
|
- BaseFilePO baseFilePO = baseFileService.getById(record.getBaseFileId());
|
|
|
- BaseFileDTO baseFileDTO = new BaseFileDTO();
|
|
|
- BeanUtils.copyProperties(baseFilePO, baseFileDTO);
|
|
|
- detectionFileDTO.setBaseFile(baseFileDTO);
|
|
|
+ if (record.getBaseFileId() != null) {
|
|
|
+ BaseFilePO baseFilePO = baseFileService.getById(record.getBaseFileId());
|
|
|
+ BaseFileDTO baseFileDTO = new BaseFileDTO();
|
|
|
+ BeanUtils.copyProperties(baseFilePO, baseFileDTO);
|
|
|
+ detectionFileDTO.setBaseFile(baseFileDTO);
|
|
|
+ }
|
|
|
DetectionFileDTOS.add(detectionFileDTO);
|
|
|
}
|
|
|
Page<DetectionFileDTO> pageToShow = new Page<>();
|