Merge branch 'dev' of http://219.151.181.73:3000/zhuwei/bladex into dev

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

@@ -956,6 +956,6 @@
                (select node_type from m_wbs_tree_private where p_key_id = ucl.wbs_node_id) as logType,
                (select node_name from m_wbs_tree_private where p_key_id = ucl.wbs_node_id) as logName
         from u_contract_log ucl
-        where contract_id = #{contractId} and is_deleted = 0
+        where contract_id = #{contractId} and is_deleted = 0 and pdf_url IS NOT NULL order by record_time
     </select>
 </mapper>

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

@@ -1148,7 +1148,7 @@ public class ArchiveTreeContractSyncImpl {
         if (StringUtils.isBlank(contractLogType)){
             throw new ServiceException("当前节点未配置同步日志资料类型");
         }
-        List<Integer> logType = Arrays.stream(contractLogType.split(","))
+        List<Integer> logType = Arrays.stream(contractLogType.split(",")).filter(l -> StringUtils.isNotBlank(l))
                 .map(Integer::parseInt) // 将每个字符串转换为Integer
                 .collect(Collectors.toList());
         //获取日志类型字典