|
@@ -482,13 +482,13 @@
|
|
|
matc1.node_name as name,
|
|
|
(SELECT COUNT(*)
|
|
|
FROM u_archives_auto uaa1
|
|
|
- WHERE uaa1.is_destroy =0 and uaa1.is_deleted =0 and uaa1.is_archive = 1 and uaa1.is_auto_file = 1 and (uaa1.node_id in
|
|
|
- (select id from m_archive_tree_contract matc2 WHERE matc2.project_id = #{projectId} and matc2.ancestors like CONCAT('%',matc1.id,'%')) or uaa1.node_id = matc1.id)
|
|
|
+ WHERE uaa1.is_destroy =0 and uaa1.is_deleted =0 and uaa1.is_archive = 1 and (uaa1.node_id in
|
|
|
+ (select id from m_archive_tree_contract matc2 WHERE matc2.project_id = #{projectId} and matc2.is_deleted = 0 and matc2.ancestors like CONCAT('%',matc1.id,'%')) or uaa1.node_id = matc1.id)
|
|
|
) as 'auto',
|
|
|
(SELECT COUNT(*)
|
|
|
FROM u_archives_auto uaa1
|
|
|
WHERE uaa1.is_destroy =1 and uaa1.is_deleted =1 and uaa1.is_archive = 1 and (uaa1.node_id in
|
|
|
- (select id from m_archive_tree_contract matc2 WHERE matc2.project_id = #{projectId} and matc2.ancestors like CONCAT('%',matc1.id,'%')) or uaa1.node_id = matc1.id)
|
|
|
+ (select id from m_archive_tree_contract matc2 WHERE matc2.project_id = #{projectId} and matc2.is_deleted = 0 and matc2.ancestors like CONCAT('%',matc1.id,'%')) or uaa1.node_id = matc1.id)
|
|
|
) as 'deleted',
|
|
|
if((SELECT COUNT(*) from m_archive_tree_contract matc WHERE parent_id = matc1.id)=0,false,true) as hasChildren
|
|
|
FROM m_archive_tree_contract matc1 WHERE matc1.project_id =#{projectId} and matc1.parent_id = #{nodeId} and matc1.is_deleted = 0
|