diff --git a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml index 20e63e3..c7982f1 100644 --- a/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml +++ b/src/main/resources/mappers/backstage/SynthesisQueryMapper.xml @@ -283,9 +283,9 @@ IF(tpc.file_resource_id IS NULL,'0','1') AS collectStatus, tcq.title, tcq.pro_name AS proName - FROM tb_comprehensive_query tcq - LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND - sfr.is_active = '1' + FROM sys_file_resource sfr + LEFT JOIN tb_comprehensive_query tcq ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND + tcq.is_active = '1' LEFT JOIN tb_photo_collect tpc ON sfr.id = tpc.file_resource_id AND tpc.collect_user_id = #{userId} LEFT JOIN ( SELECT sd.dict_value,sd.dict_name @@ -317,7 +317,7 @@ AND tcq.upload_type = #{uploadType} - AND tcq.is_active = '1' + AND sfr.is_active = '1' ORDER BY sfr.create_time DESC