|
@@ -214,6 +214,15 @@ public class ArchiveTreeServiceImpl extends BaseServiceImpl<ArchiveTreeMapper, A
|
|
|
|
|
|
List<ArchiveTreeVO2> archiveTreeVOList = baseMapper.tree2(tenantId, projectId,disPlayTree, nodeType);
|
|
|
List<ArchiveTreeVO2> treeVO2s = ForestNodeMergerEx.merge(archiveTreeVOList);
|
|
|
+ if (archiveTreeVOList != null && archiveTreeVOList.size() > 0){
|
|
|
+ List<String> list = new ArrayList<>();
|
|
|
+ archiveTreeVOList.stream().forEach(l->{
|
|
|
+ if (l.getHasChildren() == false && l.getIsDisplayTree() == 1){
|
|
|
+ list.add(l.getId()+"");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ treeVO2s.get(0).setSelectAllNodes(list);
|
|
|
+ }
|
|
|
//todo 遍历树,找到质检节点,调用getWbsArchiveTree,根据关联层级,拼接上去
|
|
|
|
|
|
//是否获取扩展的wbs节点
|
|
@@ -262,7 +271,9 @@ public class ArchiveTreeServiceImpl extends BaseServiceImpl<ArchiveTreeMapper, A
|
|
|
}
|
|
|
List<ArchiveTree> archiveTrees = baseMapper.selectList(Wrappers.<ArchiveTree>query().lambda()
|
|
|
.eq(ArchiveTree::getIsUploadFileDisplayConfigurationTree, 1));
|
|
|
- String[] idList = ids.split(",");
|
|
|
+// String[] idList = ids.split(",");
|
|
|
+ String[] split = ids.split(":");
|
|
|
+ String[] idList = split[1].substring(1, split[1].length() - 2).split(",");
|
|
|
List<String> idQ = Arrays.asList(idList);
|
|
|
List<String> idList1 = idQ.stream().filter(string -> !string.isEmpty()).collect(Collectors.toList());
|
|
|
List<String> idList2 = new ArrayList<>();
|