bug

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -3,6 +3,7 @@ package org.springblade.manager.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
@@ -223,6 +224,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                         wbsTreeContract.setIsBussShow(1);
                         wbsTreeContract.setProjectId(pawDTO.getProjectId());
                         wbsTreeContract.setContractId(pawDTO.getContractId());
+                        wbsTreeContract.setIsConcealedWorksNode(0);
                         if (wbsTreePrivate.getType() == 2) {
                             wbsTreeContract.setIsTypePrivatePid(wbsTreePrivate.getPKeyId());
                         }
@@ -437,6 +439,9 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
             }
             //标记是否隐蔽工程节点
             for (WbsTreeContract treeContract : wbsTreeContractList) {
+                if (ObjectUtils.isEmpty(treeContract.getIsConcealedWorksNode())) {
+                    treeContract.setIsConcealedWorksNode(0);
+                }
                 treeContract.setIsConcealedWorksNode(treeContract.getIsConcealedWorksNode().equals(0) ? 1 : 0);
                 LambdaUpdateWrapper<WbsTreeContract> updateWrapper = new LambdaUpdateWrapper<>();
                 updateWrapper.eq(WbsTreeContract::getPKeyId, treeContract.getPKeyId())
@@ -657,6 +662,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                                     wbsTreeContract.setFullName(nodeName);
                                     wbsTreeContract.setPartitionCode(partitionCode);
                                     wbsTreeContract.setIsImportIdentificationNode(1);
+                                    wbsTreeContract.setIsConcealedWorksNode(0);
 
                                     baseMapper.insert(wbsTreeContract);
                                     WbsTreeContractVO wbsTreeContractVO = BeanUtil.copyProperties(wbsTreeContract, WbsTreeContractVO.class);
@@ -802,6 +808,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
             wbsTreeContract.setType(1);
             wbsTreeContract.setNodeType(nodeType);
             wbsTreeContract.setIsImportIdentificationNode(0);  //识别失败
+            wbsTreeContract.setIsConcealedWorksNode(0);
             list.add(wbsTreeContract);
         }
         return list;

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -673,7 +673,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                                     continue;
                                 }
 
-                                //判断元素表在合同段wbs树中是否存在上级节点，存在则新增；不存在则表示没被引用，不新增
+                                //判断元素表在合同段wbs树中是否存在上级节点，存在则新增；不存在则不新增
                                 WbsTreeContract dataContractParent = treeContractListAllNodes.stream().filter(f ->
                                         f.getContractId().equals(String.valueOf(contractInfo.getId()))
                                                 && f.getProjectId().equals(dataContract.getProjectId())
@@ -800,7 +800,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                                     wbsTreeContract.setIsTypePrivatePid(dataPrivate.getPKeyId());
                                 }
 
-                                //判断元素表是否存在合同段，存在则不新增；不存在则表示没被引用，新增
+                                //判断元素表是否存在合同段，存在则不新增；不存在则新增
                                 WbsTreeContract resultTreeContract = treeContractListAllTables.stream().filter(f ->
                                         f.getId().equals(wbsTreeContract.getId())
                                                 && f.getNodeName().equals(wbsTreeContract.getNodeName())