Browse Source

修改了getAll时detectionDTO未存入baseFileDTO的bug

Ruilin Geng 3 years ago
parent
commit
142134c7ed

+ 6 - 4
src/main/java/cn/edu/nju/plagdemo/service/impl/DetectionFileServiceImpl.java

@@ -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<>();