chenr 3 сар өмнө
parent
commit
29cb53d37b

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

@@ -3422,6 +3422,9 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
                 List<Long> lowNodeIds = selectedNodeList.stream().filter(f -> f.getLow() == 0).map(WbsTreePrivateAddVO::getId).collect(Collectors.toList()); //最底层节点id
                 List<WbsTreePrivateAddVO> childList = new ArrayList<>();
                 if (lowNodeIds.size() > 0) {
+                    if("3".equals(vo.getSaveType())){
+                        lowNodeIds=selectedNodeList.stream().filter(f -> f.getLow() == 0&&(f.getNodeType()==6||1==f.getMajorDataType()||2==f.getMajorDataType()||3==f.getMajorDataType()||4==f.getMajorDataType())).map(WbsTreePrivateAddVO::getId).collect(Collectors.toList());
+                    }
                     //只取原始表
                     this.foreachQueryChild(lowNodeIds, childList, treeContract);
                     //将表格数据设置
@@ -3433,6 +3436,7 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
                     Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(WbsTreePrivate::getId))),
                     ArrayList::new
                 ));
+
             }
             //处理半选
             this.disposeHalfSelectList(treeContract, halfSelectedNodeList, selectedNodeList, query);