档案鉴定与立卷信息同步

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -418,7 +418,7 @@
         select uaa.id,uaa.file_number,uaa.name,uaa.file_size,CASE uaa.storage_time WHEN '1' THEN '10年' WHEN '2' THEN '30年' ELSE '永久' END as storageTimeValue
         from(
                 select id from m_archive_tree_contract
-                where project_id = #{vo.projectId} and ancestors like concat('%', #{vo.nodeId}, '%') or id = #{vo.nodeId}
+                where project_id = #{vo.projectId} and ancestors like concat('%', #{vo.nodeId}, '%') and is_deleted = 0 or id = #{vo.nodeId}
             ) matc
         left join u_archives_auto uaa on matc.id = uaa.node_id
         where
@@ -434,6 +434,7 @@
         <if test="vo.filingUnit != null and vo.filingUnit != ''">
             and uaa.filing_unit = #{vo.filingUnit}
         </if>
+        and uaa.is_archive = 1
     </select>
     <select id="getFilingUnitList" resultType="java.lang.String">
         SELECT filing_unit