diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml index d0fdc99..a272517 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml @@ -133,15 +133,15 @@ SELECT a.id, - task_id, prc_id, data_id,report_id, name, keycontent, maincontent, department, + task_id, prc_id, data_id,a.report_id, name, keycontent, maincontent, department, org.LONG_NAME as departmentName, - year,f.id as fileId, f.file_name as fileName ,rf.id as rfId ,confidentialLevel, privacyLevel, createUserId, + year,f.FILE_ID as fileId, f.file_name as fileName ,rf.id as rfId ,confidentialLevel, privacyLevel, createUserId, createDate, - updateDate, del_flag + updateDate, a.del_flag ,secrecy_last FROM a LEFT JOIN ts_org org on a.department = org.id - LEFT JOIN ts_report_file rf on rf.report_id = a.id on rf.state = 1 + LEFT JOIN ts_report_file rf on rf.report_id = a.data_id and rf.state = 1 LEFT JOIN ts_file f on f.FILE_ID = rf.file_id prc_id = #{prcId}