|
|
@@ -286,7 +286,6 @@ public class WbsSynchronousServiceImpl {
|
|
|
templateNodes.forEach(f -> {
|
|
|
f.setPKeyId(f.getId());
|
|
|
f.setTreePId(f.getId());
|
|
|
- f.setDefaultConceal(0);
|
|
|
});
|
|
|
|
|
|
} else {
|
|
|
@@ -342,10 +341,6 @@ 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);
|
|
|
- });
|
|
|
}
|
|
|
|
|
|
//筛选出需要更新的节点 同时做数据隔离
|
|
|
@@ -449,9 +444,8 @@ public class WbsSynchronousServiceImpl {
|
|
|
editPrivateNode.setInitTableName(templateNode.getInitTableName());
|
|
|
//绑定隐藏信息
|
|
|
editPrivateNode.setStatus(templateNode.getStatus());
|
|
|
- editPrivateNode.setDefaultConceal(templateNode.getDefaultConceal());
|
|
|
//合同段是根据这个字段隐藏的
|
|
|
- editPrivateNode.setIsBussShow(templateNode.getDefaultConceal() + 1);
|
|
|
+ editPrivateNode.setIsBussShow(templateNode.getIsBussShow());
|
|
|
|
|
|
if (StringUtil.isBlank(templateNode.getHtmlUrl())) {
|
|
|
throw new ServiceException(templateNode.getNodeName() + "( " + templateNode.getPKeyId() + ")HTML文件不存在");
|
|
|
@@ -832,12 +826,7 @@ public class WbsSynchronousServiceImpl {
|
|
|
//合同段新增节点
|
|
|
List<WbsTreeContract> addContractNode = null;
|
|
|
if (addPrivateNodes != null && (CollectionUtil.isEmpty(collect) || collect.contains(1))) {
|
|
|
- addContractNode = new ArrayList<>();
|
|
|
- for (WbsTreePrivate addPrivateNode : addPrivateNodes) {
|
|
|
- WbsTreeContract wbsTreeContract1 = BeanUtil.copyProperties(addPrivateNode, WbsTreeContract.class);
|
|
|
- wbsTreeContract1.setIsBussShow(addPrivateNode.getDefaultConceal() + 1);
|
|
|
- addContractNode.add(wbsTreeContract1);
|
|
|
- }
|
|
|
+ addContractNode = BeanUtil.copyProperties(addPrivateNodes, WbsTreeContract.class);
|
|
|
}
|
|
|
|
|
|
if (CollectionUtil.isNotEmpty(addContractNode)) {
|