关联原生电子文件bug修改

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

@@ -385,6 +385,23 @@
     </update>
 
     <select id="getListByContractId" resultType="org.springblade.business.entity.ArchiveFile">
+        SELECT
+            u.id,
+            u.project_id AS projectId,
+            u.node_id AS nodeId,
+            u.node_ext_id AS nodeExtId,
+            u.file_name AS fileName,
+            u.pdf_file_url AS pdfFileUrl,
+            u.sort
+        FROM
+            u_archive_file u
+                LEFT JOIN m_archive_tree_contract ar on u.node_id = ar.id
+        where 	u.contract_id = #{contractId}
+          AND u.is_deleted = 0
+          AND u.source_type = 1 and ar.is_deleted = 0;
+    </select>
+
+    <select id="getListByContractId1" resultType="org.springblade.business.entity.ArchiveFile">
         select id,
                project_id   as projectId,
                node_id      as nodeId,
@@ -395,6 +412,7 @@
         from u_archive_file
         where contract_id = #{contractId} and is_deleted = 0 and source_type = 1;
     </select>
+
     <select id="getAllArchiveAutoByContractType" resultType="org.springblade.archive.vo.ArchivesAutoVO">
         SELECT uaa.*, matc.tree_code as 'contractType'
         FROM u_archives_auto uaa

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

@@ -73,6 +73,7 @@
         <result column="key" property="key"/>
         <result column="has_children" property="hasChildren"/>
         <result column="node_type" property="nodeType"/>
+        <result column="major_data_type" property="majorDataType"/>
         <result column="old_id" property="oldId"/>
         <result column="sort" property="sort"/>
     </resultMap>
@@ -463,6 +464,7 @@
         d.id AS "value",
         d.id AS "key",
         old_id,
+        major_data_type,
         sort
         FROM m_wbs_tree_contract d
         WHERE

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeContractSyncImpl.java

@@ -615,7 +615,7 @@ public class ArchiveTreeContractSyncImpl {
             if (current == null) {
                 return null; // 如果没有找到对应的节点，则返回 null
             }
-            if (current.getNodeType().equals(nodeType)) {
+            if (current.getNodeType() <= nodeType && !current.getNodeName().contains("中间交工")) {
                 return current.getPKeyId(); // 如果找到了符合要求的节点，则返回其 pKeyId 属性值
             }
             id = current.getParentId(); // 取出当前节点的父节点 ID，准备进行下一轮循环操作