chendayu преди 2 години
родител
ревизия
9f772a6733

+ 0 - 3
RMS/src/main/java/cn/cslg/report/controller/ProductController.java

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

+ 6 - 4
RMS/src/main/java/cn/cslg/report/service/impl/ProductServiceImpl.java

@@ -110,11 +110,13 @@ public class ProductServiceImpl implements IProductService {
         }
 
         //7.插入新的附件入报告系统文件表中,返回文件id
-        List<Integer> fileIds = reportFileService.uploadFiles(files);
+        if (files != null) {
+            List<Integer> fileIds = reportFileService.uploadFiles(files);
+            //8.插入新的文件id入产品文件关联表中
+            Integer productId = product.getId();
+            assoProductFileService.addAsso(productId, fileIds);
+        }
 
-        //8.插入新的文件id入产品文件关联表中
-        Integer productId = product.getId();
-        assoProductFileService.addAsso(productId, fileIds);
 
         log.info("产品修改完成");