Merge branch 'test-merge' of http://219.151.181.73:3000/zhuwei/bladex into test-merge

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ArchiveFileMapper.xml

@@ -73,9 +73,9 @@
     <select id="selectArchiveFileCount" resultType="java.lang.Integer">
         select count(u.id) from u_archive_file u
         <if test="vo.nodeIds != null and vo.nodeIds != ''">
-            left join m_archive_tree_contract t on t.id = u.node_id
+            left join m_archive_tree_contract t on t.id = u.node_id and t.is_deleted= 0
             <if test="vo.extType != null">
-                LEFT JOIN m_archive_tree_contract m ON m.id = u.node_ext_id
+                LEFT JOIN m_archive_tree_contract m ON m.id = u.node_ext_id and m.is_deleted= 0
             </if>
         </if>
         where u.is_deleted = 0
@@ -158,9 +158,9 @@
     <select id="selectArchiveFilePage" resultMap="archiveFileResultMap">
         select u.* from u_archive_file u
         <if test="vo.nodeIds != null and vo.nodeIds != ''">
-            left join m_archive_tree_contract t on t.id = u.node_id
+            left join m_archive_tree_contract t on t.id = u.node_id and t.is_deleted= 0
             <if test="vo.extType != null">
-                LEFT JOIN m_archive_tree_contract m ON m.id = u.node_ext_id
+                LEFT JOIN m_archive_tree_contract m ON m.id = u.node_ext_id and m.is_deleted= 0
             </if>
         </if>
         where u.is_deleted = 0

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

@@ -337,13 +337,13 @@
 
     <!-- 文件收集 归档树的文件数量 -->
     <select id="selectFileNumber" resultType="java.lang.Integer">
-        SELECT  count(1)  FROM m_archive_tree_contract a
+        SELECT  sum(b.file_page)  FROM m_archive_tree_contract a
         inner join u_archive_file b on b.node_id = a.id and b.is_deleted = a.is_deleted and b.project_id = a.project_id and (b.is_auto_file is null or b.is_auto_file != 1)
         WHERE  a.is_deleted = 0
         and a.project_id = #{projectId}
         <choose>
             <when test="extType != null and extType == 1">
-                and ( 	b.node_id in( select id from  m_archive_tree_contract where FIND_IN_SET(#{id},ancestors) or a.id = #{id}) OR
+                and (b.node_id in( select id from  m_archive_tree_contract where FIND_IN_SET(#{id},ancestors) or a.id = #{id}) OR
                 b.node_ext_id in(  select id from  m_archive_tree_contract where FIND_IN_SET(#{id},ancestors) or a.id = #{id}))
             </when>
             <otherwise>