Merge branch '0626zhifk'

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ArchiveTreeContractVO2.java

@@ -230,6 +230,8 @@ public class ArchiveTreeContractVO2 implements INodeEx<ArchiveTreeContractVO2> {
     //案卷后缀
     private String archiveNameSuffix;
 
+    private Integer treeNumber;
+
     public String toString() {
         return "TreeNode(parentId=" + this.getParentId()
                 + ",ancestors" + this.getAncestors()

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeContractMapper.xml

@@ -116,6 +116,7 @@
         <result column="reviewer" property="reviewer"/>
         <result column="specification" property="specification"/>
         <result column="archive_name_suffix" property="archiveNameSuffix"/>
+        <result column="tree_number" property="treeNumber"/>
     </resultMap>
 
 
@@ -215,7 +216,12 @@
         d.archive_name_suffix,
         d.contract_id,
         (SELECT CASE WHEN count(1) > 0 THEN 1 ELSE 0 END FROM m_archive_tree_contract WHERE parent_id = d.id and is_deleted = 0 and project_id = #{projectId})
-        AS "has_children"
+        AS "has_children",
+        (SELECT  count(1)  FROM m_archive_tree_contract WHERE  is_deleted = 0 and project_id = #{projectId} and ancestors like CONCAT('%',d.id,'%')
+        <if test="code!=null and code!=''">
+            AND (tree_code = #{code} or tree_code = #{contractId} or parent_id = 0)
+        </if>
+        ) as tree_number
         FROM
         m_archive_tree_contract d
         WHERE