Merge remote-tracking branch 'origin/master'

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/vo/ArchivesAutoVO.java

@@ -195,5 +195,6 @@ public class ArchivesAutoVO extends ArchivesAuto {
 		private  String archiveId;
 
 		private Long id;
+		private Long fileSize;
 	}
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveFileAutoController.java

@@ -99,7 +99,7 @@ public class ArchiveFileAutoController extends BladeController {
                     this.archiveFileClient.saveArchiveFile(saveVos);
                     archive.setFileN(saveVos.getSize());
                     archive.setPageN(pageN);
-                    List<ArchiveTreeContract> archiveTreeContracts = this.archiveTreeContractClient.queryAllChildByAncestors(saveVos.getNodeId(), saveVos.getContractId() == null ? null : Long.parseLong(saveVos.getContractId()));
+                    List<ArchiveTreeContract> archiveTreeContracts = this.archiveTreeContractClient.queryAllChildByAncestors(archive.getNodeId()+"", archive.getContractId() == null ? null : archive.getContractId());
                     if (archiveTreeContracts != null && archiveTreeContracts.size() > 0) {
                         archive.setTreeSort(archiveTreeContracts.get(0).getTreeSort());
                         if (archiveTreeContracts.get(0).getStorageType() != null) {

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -1649,7 +1649,9 @@ public class InformationWriteQueryController extends BladeController {
                         //更新redis缓存
                         informationQueryService.delAsyncWbsTree(contractId);
                     }
+                    String nodeName = vo.getNeedCopyNodeName();
                     StringBuilder addNames = new StringBuilder();
+                    addNames.append(nodeName+"-");
                     addNames.append("[");
                     for (WbsTreeContract node : toCopyNodes) {
                         addNames.append(node.getNodeName() + "-");