Merge remote-tracking branch 'origin/dev' into dev

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

@@ -62,7 +62,7 @@ public class ProductController {
     @Operation(summary = "根据报告id查询产品数据信息")
     @GetMapping("/getProduct")
     public String getProduct(Integer reportId) {
-        log.info("开始处理【根据报告id查询产品数据信息】的请求，参数为：{}", reportId);
+        log.info("开始处理【查询产品】的请求，参数为：{}", reportId);
         if (reportId != null) {
             ProductIncludeFilesVO queryResult = productService.getProduct(reportId);
             return Response.success(queryResult);

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

@@ -132,7 +132,11 @@ public class ProductServiceImpl implements IProductService {
     @Override
     public ProductIncludeFilesVO getProduct(Integer reportId) {
         log.info("开始处理【查询产品】的业务，参数为：{}", reportId);
-        return productMapper.getWholeByReportId(reportId);
+        ProductIncludeFilesVO queryResult = productMapper.getWholeByReportId(reportId);
+        if (queryResult == null) {
+            log.info("查询成功，产品不存在");
+        }
+        return queryResult;
 
     }