|
|
@@ -1696,9 +1696,9 @@ public R<Boolean> copyContractTreeNode(@RequestBody CopyContractTreeNodeVO vo) {
|
|
|
//如果当前节点是选中节点
|
|
|
if (vo.getNeedCopyPrimaryKeyId().equals(nodeOld.getPKeyId().toString())) {
|
|
|
//新节点父级id 为 选中节点的父级id
|
|
|
- newData.setParentId(parent.getId());
|
|
|
+ newData.setParentId(parent.getId() != null ? parent.getId() : null);
|
|
|
//20250414-lhb-新增
|
|
|
- newData.setPId(parent.getPKeyId());
|
|
|
+ newData.setPId(parent.getPKeyId() != null ? parent.getPKeyId() : null);
|
|
|
//新节点设置
|
|
|
newData.setNodeName(vo.getNeedCopyNodeName());
|
|
|
newData.setFullName(vo.getNeedCopyNodeName());
|
|
|
@@ -2679,7 +2679,7 @@ private void addCopyNodesAndTabsBuildData(List<WbsTreeContract> addNodeList, Lis
|
|
|
//同节点
|
|
|
needCopyNode.setParentId(needCopyNode.getParentId());
|
|
|
//20250414-lhb-新增
|
|
|
- needCopyNode.setPId(needCopyNode.getPId());
|
|
|
+ needCopyNode.setPId(needCopyNode.getPId() != null ? needCopyNode.getPId() : null);
|
|
|
} else {
|
|
|
//跨节点
|
|
|
needCopyNode.setParentId(toCopyNode.getId());
|
|
|
@@ -3452,7 +3452,7 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
|
|
|
if (("1").equals(node.getIsPeer())) {
|
|
|
//同级
|
|
|
newData.setParentId(treeContract.getParentId());
|
|
|
- newData.setPId(treeContract.getPId());
|
|
|
+ newData.setPId(treeContract.getPId() != null ? treeContract.getPId() : 0L);
|
|
|
|
|
|
} else if (("2").equals(node.getIsPeer())) {
|
|
|
//下一级
|
lvy