mapper 中添加 deleted is false 条件

oss-store/src/main/resources/mapper/DataBlockMapper.xml

@@ -25,18 +25,19 @@
     <select id="findDataBlocks" resultType="cn.reghao.oss.store.model.po.DataBlock">
         select *
         from data_block
-        where id>#{nextId}
+        where deleted is false and id>#{nextId}
         limit #{pageSize}
     </select>
 
     <select id="findByContentId" resultType="cn.reghao.oss.store.model.po.DataBlock">
         select *
         from data_block
-        where content_id=#{contentId}
+        where deleted is false and content_id=#{contentId}
     </select>
     <select id="findSubDirCount" resultType="cn.reghao.oss.store.disk.SubDirCount">
         select relative_dir,count(*) as total
         from data_block
+        where deleted is false
         group by relative_dir
         order by total asc
     </select>

oss-store/src/main/resources/mapper/FileMetaMapper.xml

@@ -83,8 +83,9 @@
     </select>
 
     <select id="findBySha256sum" resultType="cn.reghao.oss.store.model.po.FileMeta">
-        select * from file_meta
-        where sha256sum=#{sha256sum}
+        select *
+        from file_meta
+        where deleted is false and sha256sum=#{sha256sum}
         order by create_time asc
         limit 1
     </select>
@@ -96,7 +97,7 @@
     <select id="findByObjectNames" resultType="cn.reghao.oss.store.model.po.FileMeta">
         select *
         from file_meta
-        where object_name in
+        where deleted is false and object_name in
         <foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
             #{id}
         </foreach>
@@ -105,12 +106,12 @@
     <select id="findByObjectId" resultType="cn.reghao.oss.store.model.po.FileMeta">
         select *
         from file_meta
-        where object_id=#{objectId}
+        where deleted is false and object_id=#{objectId}
     </select>
     <select id="findByContentId" resultType="cn.reghao.oss.store.model.po.FileMeta">
         select *
         from file_meta
-        where content_id=#{contentId}
+        where deleted is false and content_id=#{contentId}
     </select>
     <select id="findObjectMetaByName" resultType="cn.reghao.oss.api.dto.ObjectMeta">
         select file_meta.size,file_meta.content_type,file_meta.object_name,file_meta.object_id,file_meta.scope as scope,file_meta.upload_by,
@@ -125,13 +126,13 @@
         data_block.absolute_path
         from file_meta
         inner join data_block
-        on file_meta.content_id=data_block.content_id
+        on file_meta.deleted is false and file_meta.content_id=data_block.content_id
         and file_meta.object_id=#{objectId}
     </select>
     <select id="findObjectNames" resultType="java.lang.String">
         select object_name
         from file_meta
-        where object_id in
+        where deleted is false and object_id in
         <foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
             #{id}
         </foreach>
@@ -140,12 +141,12 @@
     <select id="countByPid" resultType="java.lang.Integer">
         select count(*)
         from file_meta
-        where deleted=0 and pid=#{pid}
+        where deleted is false and pid=#{pid}
     </select>
     <select id="findPidByPage" resultType="cn.reghao.oss.sdk.model.dto.ObjectInfo">
         select size,object_name,object_id,file_type,filename,date_format(update_time, '%Y-%m-%d %H:%i:%s') as update_time
         from file_meta
-        where deleted=0 and pid=#{pid}
+        where deleted is false and pid=#{pid}
     </select>
 
     <!--*************************************************************************************************************-->