测试问题修改
This commit is contained in:
parent
dece94d5ca
commit
367f769bd7
|
|
@ -283,9 +283,9 @@
|
||||||
IF(tpc.file_resource_id IS NULL,'0','1') AS collectStatus,
|
IF(tpc.file_resource_id IS NULL,'0','1') AS collectStatus,
|
||||||
tcq.title,
|
tcq.title,
|
||||||
tcq.pro_name AS proName
|
tcq.pro_name AS proName
|
||||||
FROM tb_comprehensive_query tcq
|
FROM sys_file_resource sfr
|
||||||
LEFT JOIN sys_file_resource sfr ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND
|
LEFT JOIN tb_comprehensive_query tcq ON tcq.id = sfr.source_id AND tcq.upload_type = sfr.upload_type AND
|
||||||
sfr.is_active = '1'
|
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 tb_photo_collect tpc ON sfr.id = tpc.file_resource_id AND tpc.collect_user_id = #{userId}
|
||||||
LEFT JOIN (
|
LEFT JOIN (
|
||||||
SELECT sd.dict_value,sd.dict_name
|
SELECT sd.dict_value,sd.dict_name
|
||||||
|
|
@ -317,7 +317,7 @@
|
||||||
<if test="uploadType!=null and uploadType!=0">
|
<if test="uploadType!=null and uploadType!=0">
|
||||||
AND tcq.upload_type = #{uploadType}
|
AND tcq.upload_type = #{uploadType}
|
||||||
</if>
|
</if>
|
||||||
AND tcq.is_active = '1'
|
AND sfr.is_active = '1'
|
||||||
</where>
|
</where>
|
||||||
ORDER BY sfr.create_time DESC
|
ORDER BY sfr.create_time DESC
|
||||||
</select>
|
</select>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue