新增节点还原

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

@@ -2650,6 +2650,9 @@ public class InformationWriteQueryController extends BladeController {
         selectList.addAll(halfSelectedNodeList);
         selectList.addAll(allSelectedNodeList);
 
+        //结果集，匹配节点名称使用
+        List<WbsTreePrivate> query = new ArrayList<>();
+        List<String> pKeyIds = selectList.stream().map(AddContractTreeNodeVO.Node::getPrimaryKeyId).collect(Collectors.toList());
         //所有相关节点集合
         List<WbsTreeContract> selectedNodeList = new ArrayList<>();
 
@@ -2659,8 +2662,10 @@ public class InformationWriteQueryController extends BladeController {
             //当前节点及其子节点时，半选说明其下的子节点并不是全部选中的，所以这时候只需要根据全选的查询其全部子节点即可
             if (allSelectedNodeList.size() > 0) {
                 //查询数据
-                selectedNodeList = this.unifiedCode(allSelectedNodeList, treeContract, "1");
-
+                selectedNodeList = this.unifiedCode(allSelectedNodeList, treeContract, "1", query);
+                if (ObjectUtil.isEmpty(selectedNodeList)) {
+                    return R.data(null);
+                }
                 //检查当前操作的节点是否是填报节点，如果是则需要查询相关联表格
                 List<WbsTreeContract> submitNodeList = selectedNodeList.stream().filter(treeContract1 -> Arrays.asList("1,2,3,4".split(",")).contains(treeContract1.getMajorDataType().toString())).distinct().collect(Collectors.toList());
 
@@ -2690,7 +2695,7 @@ public class InformationWriteQueryController extends BladeController {
                 selectedNodeList.addAll(childList);
             }
             //处理半选
-            this.disposeHalfSelectList(treeContract, halfSelectedNodeList, selectedNodeList);
+            this.disposeHalfSelectList(treeContract, halfSelectedNodeList, selectedNodeList, query);
 
         } else {
             //todo 仅当前节点操作
@@ -2699,8 +2704,10 @@ public class InformationWriteQueryController extends BladeController {
                     throw new ServiceException("只能选择单节点进行新增操作");
                 }
                 //查询数据
-                selectedNodeList = this.unifiedCode(allSelectedNodeList, treeContract, "0");
-
+                selectedNodeList = this.unifiedCode(allSelectedNodeList, treeContract, "0", query);
+                if (ObjectUtil.isEmpty(selectedNodeList)) {
+                    return R.data(null);
+                }
                 //检查当前操作的节点是否是填报节点，如果是则需要查询相关联表格
                 List<WbsTreeContract> submitNodeList = selectedNodeList.stream().filter(treePrivate -> Arrays.asList("1,2,3,4".split(",")).contains(treePrivate.getMajorDataType().toString())).distinct().collect(Collectors.toList());
 
@@ -2718,6 +2725,16 @@ public class InformationWriteQueryController extends BladeController {
         List<WbsTreeContract> saveList = new ArrayList<>();
         List<ConstructionLedger> saveLedger = new ArrayList<>();
 
+        //封裝节点名称nodeName与id的Map
+        Map<Long, String> idAndNodeNameMaps = query.stream()
+                .filter(wbsTreePrivate -> pKeyIds.contains(wbsTreePrivate.getPKeyId().toString()))
+                .collect(Collectors.toMap(WbsTreePrivate::getId,
+                        wbsTreePrivate -> selectList.stream()
+                                .filter(node -> node.getPrimaryKeyId().equals(wbsTreePrivate.getPKeyId().toString()))
+                                .findFirst()
+                                .map(AddContractTreeNodeVO.Node::getNodeName)
+                                .orElse("")));
+
         //原始表ids，电签位置信息使用
         List<Long> oldTabIds = selectedNodeList.stream().filter(f -> new Integer(2).equals(f.getType())).map(WbsTreeContract::getId).collect(Collectors.toList());
 
@@ -2799,14 +2816,7 @@ public class InformationWriteQueryController extends BladeController {
                 newData.setSort(ObjectUtils.isNotEmpty(half.getSort()) ? half.getSort() : 0);
 
                 //设置节点名称
-                for (AddContractTreeNodeVO.Node addVO : selectList) {
-                    if (half.getPKeyId().toString().equals(addVO.getPrimaryKeyId())) {
-                        if (StringUtils.isNotEmpty(addVO.getNodeName())) {
-                            newData.setFullName(addVO.getNodeName());
-                        }
-                        break;
-                    }
-                }
+                newData.setFullName(ObjectUtil.isNotEmpty(idAndNodeNameMaps.get(half.getId())) ? idAndNodeNameMaps.get(half.getId()) : half.getFullName());
 
                 //重塑父节点关联关系
                 String ancestors = newData.getAncestors();
@@ -2827,16 +2837,6 @@ public class InformationWriteQueryController extends BladeController {
                     newData.setAncestors(stringBuilder.substring(1));
                 }
 
-                //设置名称
-                Iterator<AddContractTreeNodeVO.Node> iterator = selectList.iterator();
-                while (iterator.hasNext()) {
-                    AddContractTreeNodeVO.Node next = iterator.next();
-                    if (next.getPrimaryKeyId().equals(half.getPKeyId().toString())) {
-                        newData.setFullName(next.getNodeName());
-                        iterator.remove();
-                        break;
-                    }
-                }
                 //设置到保存集合中
                 saveList.add(newData);
 
@@ -2883,22 +2883,31 @@ public class InformationWriteQueryController extends BladeController {
         }
     }
 
-    private List<WbsTreeContract> unifiedCode(List<AddContractTreeNodeVO.Node> allSelectedNodeList, WbsTreeContract treeContract, String saveType) {
-        //获取主键
+    private List<WbsTreeContract> unifiedCode(List<AddContractTreeNodeVO.Node> allSelectedNodeList, WbsTreeContract treeContract, String saveType, List<WbsTreePrivate> queryResultP) {
+        //获取项目节点树的主键
         List<Long> halfSelectedList = allSelectedNodeList.stream().map(AddContractTreeNodeVO.Node::getPrimaryKeyId).map(Long::parseLong).distinct().collect(Collectors.toList());
-        //查询数据
-        List<WbsTreeContract> selectedNodeList = jdbcTemplate.query("select * from m_wbs_tree_contract where status = 1 and is_deleted = 0 and p_key_id in(" + StringUtils.join(halfSelectedList, ",") + ")", new BeanPropertyRowMapper<>(WbsTreeContract.class));
-
-        //剔除与当前操作节点相同的ID，（如果saveType=1，表示当前及子级节点，那么就要剔除自己本身，否则视为仅当前节点操作，会存在自己本身）
-        if ("1".equals(saveType)) {
-            //selectedNodeList.removeIf(wbsTreePrivate -> treeContract.getId().equals(wbsTreePrivate.getId()) || treeContract.getOldId().equals(wbsTreePrivate.getId().toString()));
-            selectedNodeList.removeIf(wbsTreePrivate -> {
-                Long id = wbsTreePrivate.getId();
-                return treeContract.getId() != null && treeContract.getId().equals(id);
-            });
+
+        //获取项目对应的合同段的树原始节点的信息
+        List<WbsTreePrivate> query = jdbcTemplate.query("select * from m_wbs_tree_private where p_key_id in(" + StringUtils.join(halfSelectedList, ",") + ")", new BeanPropertyRowMapper<>(WbsTreePrivate.class));
+        List<Long> projectNodeIds = query.stream().map(WbsTreePrivate::getId).collect(Collectors.toList());
+        if (projectNodeIds.size() > 0) {
+            //返回结果集，匹配节点名称使用
+            queryResultP.addAll(query);
+
+            //查询数据
+            List<WbsTreeContract> selectedNodeList = jdbcTemplate.query("select * from m_wbs_tree_contract where contract_id = " + treeContract.getContractId() + " and status = 1 and is_deleted = 0 and id in(" + StringUtils.join(projectNodeIds, ",") + ")", new BeanPropertyRowMapper<>(WbsTreeContract.class));
+
+            //剔除与当前操作节点相同的ID，（如果saveType=1，表示当前及子级节点，那么就要剔除自己本身，否则视为仅当前节点操作，会存在自己本身）
+            if ("1".equals(saveType)) {
+                selectedNodeList.removeIf(wbsTreePrivate -> {
+                    Long id = wbsTreePrivate.getId();
+                    return treeContract.getId() != null && treeContract.getId().equals(id);
+                });
+            }
+            return selectedNodeList;
         }
 
-        return selectedNodeList;
+        return null;
     }
 
     @NotNull
@@ -3006,20 +3015,30 @@ public class InformationWriteQueryController extends BladeController {
     /**
      * 处理半选集合
      */
-    private void disposeHalfSelectList(@RequestBody WbsTreeContract treeContract, List<AddContractTreeNodeVO.Node> allSelectedNodeList, List<WbsTreeContract> selectedNodeList) {
+    private void disposeHalfSelectList(@RequestBody WbsTreeContract treeContract, List<AddContractTreeNodeVO.Node> allSelectedNodeList, List<WbsTreeContract> selectedNodeList, List<WbsTreePrivate> queryResultP) {
         if (allSelectedNodeList != null && allSelectedNodeList.size() > 0) {
             //获取主键
             List<Long> allSelectedList = allSelectedNodeList.stream().map(AddContractTreeNodeVO.Node::getPrimaryKeyId).map(Long::parseLong).distinct().collect(Collectors.toList());
-            //查询对应数据
-            List<WbsTreeContract> allSelectedNodeLists = this.wbsTreeContractClient.queryContractTreeNodeByPKIds(allSelectedList);
-            //剔除与当前操作节点相同的ID
-            allSelectedNodeLists.removeIf(wbsTreePrivate -> {
-                Long id = wbsTreePrivate.getId();
-                return treeContract.getId() != null && treeContract.getId().equals(id);
-            });
-            //allSelectedNodeLists.removeIf(wbsTreePrivate -> treeContract.getId().equals(wbsTreePrivate.getId()) || treeContract.getOldId().equals(wbsTreePrivate.getId().toString()));
-            //设置到集合中
-            selectedNodeList.addAll(allSelectedNodeLists);
+
+            //获取项目对应的合同段的树原始节点的信息
+            List<WbsTreePrivate> query = jdbcTemplate.query("select * from m_wbs_tree_private where p_key_id in(" + StringUtils.join(allSelectedList, ",") + ")", new BeanPropertyRowMapper<>(WbsTreePrivate.class));
+            List<Long> projectNodeIds = query.stream().map(WbsTreePrivate::getId).collect(Collectors.toList());
+            if (projectNodeIds.size() > 0) {
+                //返回结果集，匹配节点名称使用
+                queryResultP.addAll(query);
+
+                //查询数据
+                List<WbsTreeContract> allSelectedNodeLists = jdbcTemplate.query("select * from m_wbs_tree_contract where contract_id = " + treeContract.getContractId() + " and status = 1 and is_deleted = 0 and id in(" + StringUtils.join(projectNodeIds, ",") + ")", new BeanPropertyRowMapper<>(WbsTreeContract.class));
+
+                //剔除与当前操作节点相同的ID
+                allSelectedNodeLists.removeIf(wbsTreePrivate -> {
+                    Long id = wbsTreePrivate.getId();
+                    return treeContract.getId() != null && treeContract.getId().equals(id);
+                });
+
+                //设置到集合中
+                selectedNodeList.addAll(allSelectedNodeLists);
+            }
         }
     }
 

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialMaterialMobilizationServiceImpl.java

@@ -136,7 +136,7 @@ public class TrialMaterialMobilizationServiceImpl extends BaseServiceImpl<TrialM
 
         IPage<TrialMaterialMobilizationVO> trialMaterialMobilizationVOIPage = TrialMaterialMobilizationWarpper.build().pageVO(pages);
         List<TrialMaterialMobilizationVO> records = trialMaterialMobilizationVOIPage.getRecords();
-        Map<String, Attach> fileMaps = jdbcTemplate.query("select link,original_name from blade_attach", new BeanPropertyRowMapper<>(Attach.class)).stream().collect(Collectors.toMap(Attach::getLink, Function.identity()));
+        Map<String, String> fileMaps = jdbcTemplate.query("select link,original_name from blade_attach", new BeanPropertyRowMapper<>(Attach.class)).stream().collect(Collectors.toMap(Attach::getLink, Attach::getOriginalName, (key1, key2) -> key2));
         for (TrialMaterialMobilizationVO record : records) {
             for (User user : userList) {
                 if (user.getId().equals(record.getUserId())) {
@@ -145,21 +145,21 @@ public class TrialMaterialMobilizationServiceImpl extends BaseServiceImpl<TrialM
                 }
             }
             if (StringUtils.isNotEmpty(record.getOtherAccessories())) {
-                Attach attach = fileMaps.get(record.getOtherAccessories());
+                String attach = fileMaps.get(record.getOtherAccessories());
                 if (attach != null) {
-                    record.setOtherAccessoriesName(StringUtils.isNotEmpty(attach.getOriginalName()) ? attach.getOriginalName() : "");
+                    record.setOtherAccessoriesName(attach);
                 }
             }
             if (StringUtils.isNotEmpty(record.getProductionCertificate())) {
-                Attach attach = fileMaps.get(record.getProductionCertificate());
+                String attach = fileMaps.get(record.getProductionCertificate());
                 if (attach != null) {
-                    record.setProductionCertificateName(StringUtils.isNotEmpty(attach.getOriginalName()) ? attach.getOriginalName() : "");
+                    record.setProductionCertificateName(attach);
                 }
             }
             if (StringUtils.isNotEmpty(record.getQualityInspectionReport())) {
-                Attach attach = fileMaps.get(record.getQualityInspectionReport());
+                String attach = fileMaps.get(record.getQualityInspectionReport());
                 if (attach != null) {
-                    record.setQualityInspectionReportName(StringUtils.isNotEmpty(attach.getOriginalName()) ? attach.getOriginalName() : "");
+                    record.setQualityInspectionReportName(attach);
                 }
             }
         }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ContractInfoController.java

@@ -546,8 +546,9 @@ public class ContractInfoController extends BladeController {
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "pKeyId", value = "选择的节点pKeyId", required = true)
     })
+    @Deprecated
     public R addNodeTree(String pKeyId) {
-        List<WbsTreeContractVO> tree = contractInfoService.addNodeTree(pKeyId);
+        List<WbsTreePrivateVO> tree = contractInfoService.addNodeTree(pKeyId);
         if (tree != null && tree.size() > 0) {
             return R.data(tree);
         }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IContractInfoService.java

@@ -75,7 +75,7 @@ public interface IContractInfoService extends BaseService<ContractInfo> {
 
     Map<Long, List<WbsTreeContractTreeAllVO>> treeAllJL(String contractId, Integer type);
 
-    List<WbsTreeContractVO> addNodeTree(String pKeyId);
+    List<WbsTreePrivateVO> addNodeTree(String pKeyId);
 
     List<ContractInfo> getContractListByProjectId(Long projectId);
 

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

@@ -35,6 +35,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
+import java.lang.reflect.Field;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -47,6 +48,7 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
     private final SaveUserInfoByProjectMapper saveUserInfoByProjectMapper;
     private final SaveUserInfoByProjectServiceImpl saveUserInfoByProjectService;
     private final WbsTreeContractMapper wbsTreeContractMapper;
+    private final WbsTreePrivateMapper wbsTreePrivateMapper;
     private final JdbcTemplate jdbcTemplate;
     private final IUserClient iUserClient;
     private final InformationQueryClient informationQueryClient;
@@ -187,7 +189,7 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
     }
 
     @Override
-    public List<WbsTreeContractVO> addNodeTree(String pKeyId) {
+    public List<WbsTreePrivateVO> addNodeTree(String pKeyId) {
         WbsTreeContract parentNodeRoot = wbsTreeContractMapper.selectOne(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getPKeyId, pKeyId).eq(WbsTreeContract::getStatus, 1));
         if (parentNodeRoot != null) {
             //oldId不等于空，说明是复制节点，通过oldId，去获取原始树节点
@@ -196,16 +198,105 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
             }
             List<WbsTreeContract> allNodes = this.getChildNodes(parentNodeRoot);
             if (allNodes == null) {
-                allNodes = new ArrayList<>();
+                //如果是最底层节点，那么直接返回null，最底层节点无法新增子节点
+                return null;
             }
             allNodes.add(parentNodeRoot);
 
-            List<WbsTreeContractVO> resultAllNodes = BeanUtil.copyProperties(allNodes, WbsTreeContractVO.class);
-            return buildWbsTreeByStreamChildNodeTree(resultAllNodes, parentNodeRoot);
+            //获取所有合同段树原始节点对应的项目树节点
+            List<Long> nodeIds = allNodes.stream().map(WbsTreeContract::getId).collect(Collectors.toList());
+
+            //重新赋值
+            List<WbsTreePrivate> projectTreeNodes = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>lambdaQuery().in(WbsTreePrivate::getId, nodeIds)
+                    .eq(WbsTreePrivate::getProjectId, parentNodeRoot.getProjectId()).eq(WbsTreePrivate::getWbsId, parentNodeRoot.getWbsId()).eq(WbsTreePrivate::getStatus, 1));
+            //构造树
+            List<WbsTreePrivateVO> resultAllNodes = BeanUtil.copyProperties(projectTreeNodes, WbsTreePrivateVO.class);
+            WbsTreePrivateVO parentNodeRootProject = BeanUtil.copyProperties(parentNodeRoot, WbsTreePrivateVO.class);
+            return buildWbsTreeByStreamChildNodeTreeProject(resultAllNodes, parentNodeRootProject);
         }
         return null;
     }
 
+    /**
+     * 获取树结构
+     *
+     * @param obj
+     * @return
+     */
+    private WbsTreeContract recursionFindResourceRootNode(WbsTreeContract obj) {
+        if (obj.getOldId() != null) {
+            WbsTreeContract obj1 = wbsTreeContractMapper.selectOne(Wrappers.<WbsTreeContract>lambdaQuery()
+                    .eq(WbsTreeContract::getId, obj.getOldId())
+                    .eq(WbsTreeContract::getContractId, obj.getContractId()));
+            if (obj1 != null && obj1.getOldId() != null) {
+                obj1 = this.recursionFindResourceRootNode(obj1);
+            } else {
+                // 已经到达原始节点，返回当前节点的id
+                return obj1 != null ? obj1 : obj;
+            }
+            obj = obj1;
+        }
+        return obj;
+    }
+
+    private List<WbsTreeContract> getChildNodes(WbsTreeContract obj) {
+        List<WbsTreeContract> wbsTreeContracts = Collections.singletonList(obj);
+        List<WbsTreeContract> result = new ArrayList<>();
+        this.recursionGetChildNodes(wbsTreeContracts, result, obj.getContractId());
+        if (result.size() > 0) {
+            return result;
+        }
+        return null;
+    }
+
+    private void recursionGetChildNodes(List<WbsTreeContract> list, List<WbsTreeContract> result, String contractId) {
+        List<Long> ids = list.stream().map(WbsTreeContract::getId).collect(Collectors.toList());
+        if (ids.size() > 0) {
+            //只查询原始节点
+            List<WbsTreeContract> query = jdbcTemplate.query("select * from m_wbs_tree_contract where type = 1 and old_id is null and parent_id in(" + org.apache.commons.lang.StringUtils.join(ids, ",") + ") and status = 1 and is_deleted = 0 and contract_id = " + contractId, new BeanPropertyRowMapper<>(WbsTreeContract.class));
+            if (query.size() > 0) {
+                result.addAll(query);
+                recursionGetChildNodes(query, result, contractId);
+            }
+        }
+    }
+
+    /**
+     * 构建项目树
+     *
+     * @param nodes
+     * @param parentNodeRoot
+     * @return
+     */
+    private List<WbsTreePrivateVO> buildWbsTreeByStreamChildNodeTreeProject(List<WbsTreePrivateVO> nodes, WbsTreePrivate parentNodeRoot) {
+        List<WbsTreePrivateVO> list = nodes.stream().filter(f -> f.getId().equals(parentNodeRoot.getId())).collect(Collectors.toList());
+        Map<Long, List<WbsTreePrivateVO>> map = nodes.stream().collect(Collectors.groupingBy(WbsTreePrivateVO::getParentId));
+        this.recursionFnTreeChildNodeProject(list, map);
+        return list;
+    }
+
+    private void recursionFnTreeChildNodeProject(List<WbsTreePrivateVO> list, Map<Long, List<WbsTreePrivateVO>> map) {
+        for (WbsTreePrivateVO wbsTreePrivateVO : list) {
+            List<WbsTreePrivateVO> childrenList = map.get(wbsTreePrivateVO.getId());
+            wbsTreePrivateVO.setChildren(childrenList);
+            if (childrenList != null && childrenList.size() > 0) {
+                wbsTreePrivateVO.setHasChildren(true);
+                recursionFnTreeProject(childrenList, map);
+            }
+        }
+    }
+
+    private void recursionFnTreeProject(List<WbsTreePrivateVO> list, Map<Long, List<WbsTreePrivateVO>> map) {
+        for (WbsTreePrivateVO wbsTreePrivateVO : list) {
+            List<WbsTreePrivateVO> childrenList = map.get(wbsTreePrivateVO.getId());
+            wbsTreePrivateVO.setChildren(childrenList);
+            if (childrenList != null && childrenList.size() > 0) {
+                wbsTreePrivateVO.setHasChildren(true);
+                recursionFnTreeProject(childrenList, map);
+            }
+        }
+    }
+
     @Override
     public List<ContractInfo> getContractListByProjectId(Long projectId) {
         return contractInfoMapper.getContractListByProjectId(projectId);
@@ -453,64 +544,6 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
         }
     }
 
-
-    public List<WbsTreeContractVO> buildWbsTreeByStreamChildNodeTree(List<WbsTreeContractVO> nodes, WbsTreeContract parentNodeRoot) {
-        List<WbsTreeContractVO> list = nodes.stream().filter(f -> f.getId().equals(parentNodeRoot.getId())).collect(Collectors.toList());
-        Map<Long, List<WbsTreeContractVO>> map = nodes.stream().collect(Collectors.groupingBy(WbsTreeContractVO::getParentId));
-        this.recursionFnTreeChildNode(list, map);
-        return list;
-    }
-
-    public void recursionFnTreeChildNode(List<WbsTreeContractVO> list, Map<Long, List<WbsTreeContractVO>> map) {
-        for (WbsTreeContractVO wbsTreeContractVO : list) {
-            List<WbsTreeContractVO> childrenList = map.get(wbsTreeContractVO.getId());
-            wbsTreeContractVO.setChildren(childrenList);
-            if (childrenList != null && childrenList.size() > 0) {
-                wbsTreeContractVO.setHasChildren(true);
-                recursionFnTree(childrenList, map);
-            }
-        }
-    }
-
-    private List<WbsTreeContract> getChildNodes(WbsTreeContract obj) {
-        List<WbsTreeContract> wbsTreeContracts = Collections.singletonList(obj);
-        List<WbsTreeContract> result = new ArrayList<>();
-        this.recursionGetChildNodes(wbsTreeContracts, result, obj.getContractId());
-        if (result.size() > 0) {
-            return result;
-        }
-        return null;
-    }
-
-    private WbsTreeContract recursionFindResourceRootNode(WbsTreeContract obj) {
-        if (obj.getOldId() != null) {
-            WbsTreeContract obj1 = wbsTreeContractMapper.selectOne(Wrappers.<WbsTreeContract>lambdaQuery()
-                    .eq(WbsTreeContract::getId, obj.getOldId())
-                    .eq(WbsTreeContract::getContractId, obj.getContractId()));
-            if (obj1 != null && obj1.getOldId() != null) {
-                obj1 = this.recursionFindResourceRootNode(obj1);
-            } else {
-                // 已经到达原始节点，返回当前节点的id
-                return obj1 != null ? obj1 : obj;
-            }
-            obj = obj1;
-        }
-        return obj;
-    }
-
-
-    private void recursionGetChildNodes(List<WbsTreeContract> list, List<WbsTreeContract> result, String contractId) {
-        List<Long> ids = list.stream().map(WbsTreeContract::getId).collect(Collectors.toList());
-        if (ids.size() > 0) {
-            //只查询原始节点
-            List<WbsTreeContract> query = jdbcTemplate.query("select * from m_wbs_tree_contract where type = 1 and old_id is null and parent_id in(" + org.apache.commons.lang.StringUtils.join(ids, ",") + ") and status = 1 and is_deleted = 0 and contract_id = " + contractId, new BeanPropertyRowMapper<>(WbsTreeContract.class));
-            if (query.size() > 0) {
-                result.addAll(query);
-                recursionGetChildNodes(query, result, contractId);
-            }
-        }
-    }
-
     @Override
     public List<WbsTreeContractVO6> tree6List(String wbsId, String projectId, String contractId) {
         return baseMapper.tree6(Long.parseLong(wbsId), Long.parseLong(projectId), Long.parseLong(contractId));
@@ -671,7 +704,7 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
             }
             ContractInfo contractInfo1 = baseMapper.selectById(contractInfo.getId());
             try {
-                int integer = archiveTreeContractMapper.updateByNodeName(contractInfo1.getContractName(),contractInfo.getContractName(),contractInfo.getId());
+                int integer = archiveTreeContractMapper.updateByNodeName(contractInfo1.getContractName(), contractInfo.getContractName(), contractInfo.getId());
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -894,5 +927,4 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
         this.updateById(contractInfo);
     }
 
-
 }