Merge remote-tracking branch 'origin/master'

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

@@ -333,7 +333,8 @@
         SELECT uaf.*, matc.tree_code as 'contractType'
         FROM u_archive_file uaf
                  inner join m_archive_tree_contract matc on uaf.node_id = matc.id
-        WHERE uaf.project_id = #{projectId};
+        WHERE uaf.project_id = #{projectId} and uaf.is_deleted = 0
+            and (uaf.is_auto_file is null or uaf.is_auto_file != 1);
     </select>
     <select id="getAllArchiveFileUrl" resultType="org.springblade.business.entity.ArchiveFile">
         SELECT uaf.file_url, uaf.pdf_file_url