|
|
@@ -341,6 +341,10 @@ public class WbsSynchronousServiceImpl {
|
|
|
//新增数据二次筛选 只保留任务选中的表单 但可能新增的数据包含新节点
|
|
|
if (CollectionUtil.isNotEmpty(formList)) {
|
|
|
addPrivateNodes = addPrivateNodes.stream().filter(f -> f.getType() == 1 || formList.contains(f.getPKeyId())).collect(Collectors.toList());
|
|
|
+ //新增表单时
|
|
|
+ addPrivateNodes.forEach(f->{
|
|
|
+ f.setIsBussShow(f.getDefaultConceal() + 1);
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
//筛选出需要更新的节点 同时做数据隔离
|
|
|
@@ -827,7 +831,12 @@ public class WbsSynchronousServiceImpl {
|
|
|
//合同段新增节点
|
|
|
List<WbsTreeContract> addContractNode = null;
|
|
|
if (addPrivateNodes != null && (CollectionUtil.isEmpty(collect) || collect.contains(1))) {
|
|
|
- addContractNode = BeanUtil.copyProperties(addPrivateNodes, WbsTreeContract.class);
|
|
|
+ addContractNode = new ArrayList<>();
|
|
|
+ for (WbsTreePrivate addPrivateNode : addPrivateNodes) {
|
|
|
+ WbsTreeContract wbsTreeContract1 = BeanUtil.copyProperties(addPrivateNode, WbsTreeContract.class);
|
|
|
+ wbsTreeContract1.setIsBussShow(addPrivateNode.getDefaultConceal() + 1);
|
|
|
+ addContractNode.add(wbsTreeContract1);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if (CollectionUtil.isNotEmpty(addContractNode)) {
|