ThbTech/FileManage
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Compare commits

base: ThbTech:8317b543cd88e0a622b83cce4c2db201384a845f
Branches Tags
ThbTech:main
..
compare: ThbTech:a87f90ca1b252de613193cff1c16e047b8a76cfd
Branches Tags
ThbTech:main

No commits in common. "8317b543cd88e0a622b83cce4c2db201384a845f" and "a87f90ca1b252de613193cff1c16e047b8a76cfd" have entirely different histories.
8317b543cd ... a87f90ca1b

2 changed files with 22 additions and 17 deletions
Show Stats Expand all files Collapse all files

3
java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsNodesServiceImpl.java
View File

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

36
java/src/main/java/com/yfd/platform/modules/specialDocument/service/impl/NodesServiceImpl.java
View File

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