|
|
@@ -29,13 +29,13 @@
|
|
|
select count(*)
|
|
|
from disk_camera_photo dcp
|
|
|
inner join disk_file df
|
|
|
- on dcp.file_id=df.file_id and df.`owner`=#{owner}
|
|
|
+ on df.`deleted`=0 and dcp.file_id=df.file_id and df.`owner`=#{owner}
|
|
|
</select>
|
|
|
<select id="findPhotoItemsByPage" resultType="cn.reghao.tnb.file.app.zdisk.model.vo.PhotoItem">
|
|
|
select df.file_id,df.filename,df.file_type,df.size,dcp.duration,dcp.shot_at as create_at
|
|
|
from disk_camera_photo dcp
|
|
|
inner join disk_file df
|
|
|
- on dcp.file_id=df.file_id and df.`owner`=#{owner}
|
|
|
+ on df.`deleted`=0 and dcp.file_id=df.file_id and df.`owner`=#{owner}
|
|
|
order by dcp.shot_at desc
|
|
|
</select>
|
|
|
</mapper>
|
