|
@@ -305,7 +305,7 @@
|
|
|
</select>
|
|
|
<select id="pageByArchivesAuto" resultMap="archivesAutoResultMap">
|
|
|
select uaa.* from m_archive_tree_contract matc left join u_archives_auto uaa on matc.id = uaa.node_id left join u_archive_file uaf on uaa.id = uaf.archive_id
|
|
|
- where uaa.is_deleted = 0
|
|
|
+ where uaa.is_deleted = 0 and uaa.is_archive = 1
|
|
|
<if test="vo.projectId != null and vo.projectId != ''">
|
|
|
and matc.project_id = #{vo.projectId}
|
|
|
</if>
|
|
@@ -359,7 +359,7 @@
|
|
|
or ancestors like concat('%',#{nodeId},'%') or id = #{nodeId}
|
|
|
</foreach>
|
|
|
) matc left join u_archives_auto uaa on matc.id = uaa.node_id left join u_archive_file uaf on uaa.id = uaf.archive_id
|
|
|
- where uaa.is_deleted = 0
|
|
|
+ where uaa.is_deleted = 0 and uaa.is_archive = 1
|
|
|
<if test="vo.contractId != null and vo.contractId != ''">
|
|
|
and uaa.contract_id = #{vo.contractId}
|
|
|
</if>
|