5/11

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

@@ -134,8 +134,8 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         //新增报告
         Report report = this.loadReport(reportDto);
         if (reportDto.getTrack() != null && reportDto.getTrack()) {
-           report.setCronConclusion(null);
-           report.setConclusionId(null);
+            report.setCronConclusion(null);
+            report.setConclusionId(null);
         }
         report.insert();
         if (files != null && files.size() != 0) {
@@ -262,11 +262,8 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
             SecurityUtils.startDataScope("/pcs/report/query");
             Long count = this.count(queryWrapper);
             return Response.success(reports, DataUtils.setPageColumn(reportVO.getSize(), reportVO.getCurrent(), Math.toIntExact(count)));
-        }
-        else {
-            SecurityUtils.startDataScope("/pcs/report/query");
+        } else {
             List<Report> reports = this.list(queryWrapper);
-            SecurityUtils.startDataScope("/pcs/report/query");
             long count = this.count(queryWrapper);
             reports = this.reportData(reports);
             return Response.success(reports, DataUtils.setPageColumn(0, 0, Math.toIntExact(count)));