1.4 陈宇

RMS/src/main/java/cn/cslg/report/service/impl/ProductServiceImpl.java

@@ -146,22 +146,23 @@ public class ProductServiceImpl implements IProductService {
         log.info("开始处理【删除产品】的业务，参数为：{}", reportId);
         //1.根据产品productId删除产品文件关联表数据：先根据报告id关联查询产品关联附件的数据，取出产品productId
         ProductIncludeFilesVO queryResult = this.getProduct(reportId);
-        Integer productId = queryResult.getId();
-        assoProductFileService.deleteAssoByProductId(productId);
-
-        //2.根据附件fileId集合删除报告系统文件表数据：先从产品关联附件的数据中取出附件数据，遍历附件取出附件fileId存入集合
-        List<ReportFileStandardVO> reportFiles = queryResult.getReportFiles();
-        ArrayList<Integer> list = new ArrayList<>();
-        for (ReportFileStandardVO reportFile : reportFiles) {
-            Integer fileId = reportFile.getId();
-            list.add(fileId);
+        if (queryResult != null) {
+            Integer productId = queryResult.getId();
+            assoProductFileService.deleteAssoByProductId(productId);
+            //2.根据附件fileId集合删除报告系统文件表数据：先从产品关联附件的数据中取出附件数据，遍历附件取出附件fileId存入集合
+            List<ReportFileStandardVO> reportFiles = queryResult.getReportFiles();
+            ArrayList<Integer> list = new ArrayList<>();
+            for (ReportFileStandardVO reportFile : reportFiles) {
+                Integer fileId = reportFile.getId();
+                list.add(fileId);
+            }
+            reportFileService.deleteFiles(list);
+            //3.根据报告reportId删除产品表数据
+            productMapper.deleteByReportId(reportId);
+            log.info("产品删除完成");
+        } else {
+            log.info("删除产品失败，产品不存在");
         }
-        reportFileService.deleteFiles(list);
-
-        //3.根据报告reportId删除产品表数据
-        productMapper.deleteByReportId(reportId);
-
-        log.info("产品删除完成");
 
     }
 }