Merge remote-tracking branch 'origin/master'

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ArchiveFileMapper.xml

@@ -317,7 +317,7 @@
     <select id="getAllArchiveFileUrl" resultType="org.springblade.business.entity.ArchiveFile">
         SELECT uaf.file_url ,uaf.pdf_file_url
         FROM u_archive_file uaf
-        WHERE  uaf.project_id = #{projectId};
+        WHERE  uaf.project_id = #{projectId} and uaf.is_deleted = 0;
     </select>
     <select id="getAllArchiveFileByArchiveIds" resultType="org.springblade.business.entity.ArchiveFile">
         SELECT * FROM u_archive_file