|
@@ -174,8 +174,7 @@
|
|
|
and is_lock!=1
|
|
|
and node_id in (
|
|
|
SELECT id FROM m_archive_tree_contract
|
|
|
- WHERE is_deleted = 0
|
|
|
- AND project_id = #{projectId}
|
|
|
+ WHERE project_id = #{projectId}
|
|
|
<if test="contractId == null">
|
|
|
AND ( contract_id is null OR tree_code = #{treeCode} )
|
|
|
</if>
|
|
@@ -193,7 +192,7 @@
|
|
|
and is_lock!=1
|
|
|
and node_id in (
|
|
|
SELECT id FROM m_archive_tree_contract
|
|
|
- WHERE is_deleted = 0 AND project_id = #{projectId}
|
|
|
+ WHERE project_id = #{projectId}
|
|
|
<if test="contractId == null">
|
|
|
AND ( contract_id is null OR tree_code = #{treeCode} )
|
|
|
</if>
|
|
@@ -328,7 +327,7 @@
|
|
|
and is_lock!=1
|
|
|
and node_id in (
|
|
|
SELECT id FROM m_archive_tree_contract
|
|
|
- WHERE is_deleted = 0 AND project_id = #{projectId}
|
|
|
+ WHERE project_id = #{projectId}
|
|
|
<if test="contractId == null">
|
|
|
AND ( contract_id is null OR tree_code = #{treeCode} )
|
|
|
</if>
|
|
@@ -348,8 +347,7 @@
|
|
|
AND is_lock != 1
|
|
|
AND node_id IN (
|
|
|
SELECT id FROM m_archive_tree_contract
|
|
|
- WHERE
|
|
|
- is_deleted = 0 AND project_id = #{projectId}
|
|
|
+ WHERE project_id = #{projectId}
|
|
|
AND ancestors IS NOT NULL
|
|
|
AND ancestors LIKE concat(''
|
|
|
, #{ancestors}
|