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

# Conflicts:
#	RMS/target/classes/cn/cslg/report/service/business/ReportService.class
#	RMS/target/classes/cn/cslg/report/service/business/TaskService.class

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

@@ -67,7 +67,8 @@ public class ProductController {
             ProductIncludeFilesVO queryResult = productService.getProduct(reportId);
             return Response.success(queryResult);
         } else {
-            return Response.error("报告id不能为空");
+            log.info("前端未传报告reportId");
+            return Response.error("前端未传报告reportId");
         }
 
     }

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

@@ -111,7 +111,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         }
     }
 
-    @Transactional(rollbackFor = Exception.class)
+//    @Transactional(rollbackFor = Exception.class)
     //查询报告
     public String queryReport(ReportVO reportVO) throws IOException {
         Integer id =loginUtils.getId();

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

@@ -622,7 +622,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
      * @author ：cj
      */
     public String ReviewTheTasks(TaskTDO taskVO) throws IOException {
-        PersonnelVO personnelVO = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
+//        PersonnelVO personnelVO = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
         LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(Task::getReportId, taskVO.getReportId());
         List<Task> records = this.page(new Page<>(taskVO.getCurrent(), taskVO.getSize()), lambdaQueryWrapper).getRecords();