Compare commits

...

2 Commits

Author SHA1 Message Date
lilin
8317b543cd 提交代码修改的时候也条件也需要满足 2025-05-07 10:15:09 +08:00
lilin
3b8af59dd4 提交代码 2025-05-07 10:09:35 +08:00
2 changed files with 17 additions and 22 deletions

View File

@ -347,7 +347,8 @@ public class TsNodesServiceImpl extends ServiceImpl<TsNodesMapper, TsNodes> impl
//判断节点名称是否存在
QueryWrapper<TsNodes> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("node_name", tsnodes.getNodeName());//名称
queryWrapper.eq("parent_id", tsnodes.getParentId());//父节点
queryWrapper.eq("task_id", tsnodes.getTaskId());//所属任务ID
queryWrapper.eq("parent_id", tsnodes.getParentId());//所属任务ID
int count = tsNodesMapper.selectCount(queryWrapper);
// 大于0说明 区域名称重复
if (count > 0) {

View File

@ -286,9 +286,12 @@ public class NodesServiceImpl extends ServiceImpl<NodesMapper, Nodes> implements
int orderno = this.count(queryWrapperNodeOrder.eq("parent_id", nodes.getParentId())) + 1;
//判断节点名称是否存在
LambdaQueryWrapper<Nodes> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Nodes::getNodeName, nodes.getNodeName());//名称
queryWrapper.eq(Nodes::getParentId, nodes.getParentId());//父节点
queryWrapper.eq(Nodes::getParentId, nodes.getParentId());//父节点
//名称
queryWrapper.eq(Nodes::getNodeName, nodes.getNodeName());
//父节点
queryWrapper.eq(Nodes::getParentId, nodes.getParentId());
//所属项目ID
queryWrapper.eq(Nodes::getProjectId, nodes.getProjectId());
int count = nodesMapper.selectCount(queryWrapper);
// 大于0说明 区域名称重复
if (count > 0) {
@ -307,8 +310,8 @@ public class NodesServiceImpl extends ServiceImpl<NodesMapper, Nodes> implements
if ("00".equals(nodesData.getParentId())) {
break;
}
// 获取父节点
nodesData = nodesMapper.selectById(nodesData.getParentId()); // 修正 nodesData 中获取 parentId
// 获取父节点 // 修正 nodesData 中获取 parentId
nodesData = nodesMapper.selectById(nodesData.getParentId());
}
// 反转路径使其从根节点到当前节点
Collections.reverse(pathNodes);
@ -366,9 +369,13 @@ public class NodesServiceImpl extends ServiceImpl<NodesMapper, Nodes> implements
nodes.setCreator(loginuser.getUsername());
//判断节点名称是否存在
QueryWrapper<Nodes> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("node_name", nodes.getNodeName());
queryWrapper.eq("parent_id", nodes.getParentId());//父节点
LambdaQueryWrapper<Nodes> queryWrapper = new LambdaQueryWrapper<>();
//名称
queryWrapper.eq(Nodes::getNodeName, nodes.getNodeName());
//父节点
queryWrapper.eq(Nodes::getParentId, nodes.getParentId());
//所属项目ID
queryWrapper.eq(Nodes::getProjectId, nodes.getProjectId());
int count = nodesMapper.selectCount(queryWrapper);
// 大于0说明 区域名称重复
if (count > 0) {
@ -588,19 +595,6 @@ public class NodesServiceImpl extends ServiceImpl<NodesMapper, Nodes> implements
nodesMapper.deleteById(child.getId());
}
}
//
//
//
// // 使用 QueryWrapper 查询当前节点的所有子节点
// QueryWrapper<Nodes> queryWrapper = new QueryWrapper<>();
// queryWrapper.eq("parent_id", parentId); // parent_id = #{parentId}
// List<Nodes> children = nodesMapper.selectList(queryWrapper);
//
// // 递归删除每个子节点
// for (Nodes child : children) {
// deleteChildren(child.getId()); // 递归删除子节点的子节点
// nodesMapper.deleteById(child.getId()); // 删除当前子节点
// }
}