优化合同段收藏夹

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

@@ -113,7 +113,7 @@ public class ContractCollectFolderServiceImpl extends ServiceImpl<ContractCollec
                 getAllChildren(Collections.singleton(vo.getNodeId()), childrenList);
                 childrenList.add(wbsTreeContract);
                 Map<Long, WbsTreeContract> nodeMap = childrenList.stream().collect(Collectors.toMap(WbsTreeContract::getPKeyId, v -> v, (v1, v2) -> v1));
-                List<ContractCollectFolder> list = this.list(Wrappers.<ContractCollectFolder>lambdaQuery().in(ContractCollectFolder::getNodeId, nodeMap.entrySet())
+                List<ContractCollectFolder> list = this.list(Wrappers.<ContractCollectFolder>lambdaQuery().in(ContractCollectFolder::getNodeId, nodeMap.keySet())
                         .eq(ContractCollectFolder::getType, 1).eq(ContractCollectFolder::getContractId, vo.getContractId()));
                 for (ContractCollectFolder contractCollectFolder : list) {
                     nodeMap.remove(contractCollectFolder.getNodeId());
@@ -125,7 +125,7 @@ public class ContractCollectFolderServiceImpl extends ServiceImpl<ContractCollec
                 for (WbsTreeContract contract : nodeMap.values()) {
                     ContractCollectFolder node1 = new ContractCollectFolder();
                     node1.setId(SnowFlakeUtil.getId());
-                    node1.setNodeId(vo.getNodeId());
+                    node1.setNodeId(contract.getPKeyId());
                     node1.setContractId(vo.getContractId());
                     node1.setType(1);
                     node1.setCreateUser(AuthUtil.getUserId());