12.20 陈宇

RMS/src/main/java/cn/cslg/report/controller/ProductController.java

@@ -65,6 +65,9 @@ public class ProductController {
         log.info("开始处理【根据报告id查询产品数据信息】的请求，参数为：{}", reportId);
         if (reportId != null) {
             ProductStandardVO queryResult = productService.getProduct(reportId);
+            if (queryResult == null) {
+                return Response.error("产品已不存在");
+            }
             return Response.success(queryResult);
         } else {
             return Response.error("报告id不能为空");

RMS/src/main/java/cn/cslg/report/service/business/ReportService.java

@@ -253,8 +253,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         //删除所有和报告有关的对比方案
         compareScenariosService.deleteByReportId(id);
         assoTaskPersonelService.deleAssoTaskPersonel(id);
-        //陈宇 ↓
-        //删除和报告有关的产品表数据、删除和产品有关的产品文件关联表数据、删除和产品有关的附件图片文件表数据
+        //陈宇 ↓ 删除和报告有关的产品表数据、删除和产品有关的产品文件关联表数据、删除和产品有关的附件图片文件表数据
         productService.deleteProduct(id);
 
         int dele = reportMapper.dele(id);

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

@@ -124,6 +124,7 @@ public class ProductServiceImpl implements IProductService {
     @Override
     public ProductStandardVO getProduct(Integer reportId) {
         log.info("开始处理【查询产品】的业务，参数为：{}", reportId);
+        ProductStandardVO queryResult = productMapper.getStandardByReportId(reportId);
         return productMapper.getStandardByReportId(reportId);
 
     }

RMS/src/main/resources/mapper/ProductMapper.xml

@@ -86,7 +86,7 @@
         from PRODUCT p
                  left join ASSO_PRODUCT_FILE apf on p.ID = apf.PRODUCT_ID
                  left join REPORT_FILE rf on apf.FILE_ID = rf.ID
-        where p.REPORT_ID = #{report_Id}
+        where p.REPORT_ID = #{reportId}
         order by rf_ID
     </select>
 

RMS/target/classes/mapper/ProductMapper.xml

@@ -86,7 +86,7 @@
         from PRODUCT p
                  left join ASSO_PRODUCT_FILE apf on p.ID = apf.PRODUCT_ID
                  left join REPORT_FILE rf on apf.FILE_ID = rf.ID
-        where p.REPORT_ID = #{report_Id}
+        where p.REPORT_ID = #{reportId}
         order by rf_ID
     </select>