Merge remote-tracking branch 'origin/lixuetao' into caihaohan

2023-05-25 10:52:33 +08:00
parent 6aed66b1ca dc2a8b69fe
commit def9585189
2 changed files with 4 additions and 2 deletions
@@ -156,8 +156,10 @@ public class IReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity>
        List<ReportFile> reportFiles = new ArrayList<>();
        for (String s : reportEntity.getFileList()) {
            ReportFile reportFile = new ReportFile();
+            reportFile.setId(UUID.randomUUID().replace("-",""));
            reportFile.setReportId(reportId);
            reportFile.setFileId(s);
+            reportFile.setState(2);
            reportFiles.add(reportFile);
        }
        iReportFileService.saveBatch(reportFiles);
@@ -334,11 +334,11 @@
            rm.confidentialLevel AS confidentialLevel,
            rm.privacyLevel AS privacyLevel,
            rm.secrecy_last AS secrecyLast,
-            f.id as fileId, f.file_name as fileName ,rf.id as rfId
+            f.FILE_ID as fileId, f.file_name as fileName ,rf.id as rfId
        FROM `tt_report_manage` AS rm
            LEFT JOIN ts_user AS u ON u.USID = rm.createUserId
            LEFT JOIN ts_org as org on org.id = rm.department
-            LEFT JOIN ts_report_file rf on rf.report_id = rm.id  on rf.state = 2
+            LEFT JOIN ts_report_file rf on rf.report_id = rm.id  and rf.state = 2
            LEFT JOIN ts_file f on f.FILE_ID = rf.file_id
            WHERE rm.id = #{reportId}
            AND rm.del_flag = 0