Bladeren bron

同步平天的修正

huangtf 3 maanden geleden
bovenliggende
commit
5130a58880

+ 8 - 1
blade-service/blade-archive/src/main/java/org/springblade/archive/external/impl/ExternalDataArchiveFileService.java

@@ -98,7 +98,11 @@ public class ExternalDataArchiveFileService {
 
             //nodeId nodeSUB
             Long fileNodeId = archiveTreeOutIdMapping.get(archiveFileVo.getNodeId());
-            archiveFile.setNodeId(fileNodeId.toString());
+            if (fileNodeId!= null ){
+                archiveFile.setNodeId(fileNodeId.toString());
+            }else {
+                archiveFile.setNodeId(rootId.toString());
+            }
 
             Long fileNodeExtId = archiveTreeOutIdMapping.get(archiveFileVo.getNodeIdSub());
             if (fileNodeExtId!= null ) {
@@ -167,6 +171,8 @@ public class ExternalDataArchiveFileService {
         // 字符串严格比较:格式或内容不同即视为不一致
         return !Objects.equals(extUtimeStr, localUtimeStr)
                 || !Objects.equals(external.getPdfPageUrl(), local.getPdfPageUrl());
+                //|| !Objects.equals(external.getArchiveId(), local.getArchiveId());
+
     }
 
     /**
@@ -184,6 +190,7 @@ public class ExternalDataArchiveFileService {
         local.setFilePage(external.getFilePage());
         local.setFileSize(external.getFileSize());
         local.setUtime(external.getUtime());
+        //local.setArchiveId(external.getArchiveId());
     }