节点参数相关

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

@@ -13,7 +13,6 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.StringPool;
-import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.manager.dto.WbsTreePrivateDTO2;
 import org.springblade.manager.dto.WbsTreePrivateDTO3;
 import org.springblade.manager.entity.*;
@@ -23,6 +22,7 @@ import org.springblade.manager.service.IWbsTreePrivateService;
 import org.springblade.manager.vo.WbsNodeTabAndParamVO;
 import org.springblade.manager.vo.WbsNodeTableVO;
 import org.springblade.manager.vo.WbsTreePrivateVO;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -474,8 +474,8 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                 break;
             }
             if (StringUtils.isNotEmpty(wbsId)) {
-                //获取当前参数表的所有数据
-                List<WbsParam> wbsParamListAll = wbsParamMapper.selectList(Wrappers.<WbsParam>query().lambda());
+                //获取当前参数表的所有业务数据
+                List<WbsParam> wbsParamListAll = wbsParamMapper.selectList(Wrappers.<WbsParam>query().lambda().eq(WbsParam::getType, 1));
 
                 List<WbsParam> paramListData = new ArrayList<>();
                 //获取公有树
@@ -492,26 +492,31 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                             if (wbsTree.getId().equals(wbsTreePrivate.getId())) {
                                 //获取公有节点参数
                                 List<WbsParam> wbsParamList = wbsParamListAll.stream().filter(f -> f.getWbsId().equals(wbsTree.getId())).collect(Collectors.toList());
-                                for (WbsParam param : Objects.requireNonNull(wbsParamList)) {
-                                    param.setWbsId(wbsTreePrivate.getPKeyId());
-                                    param.setId(SnowFlakeUtil.getId());
-                                    paramListData.add(param);
+                                if (wbsParamList.size() > 0) {
+                                    for (WbsParam wbsParam : wbsParamList) {
+                                        WbsParam param = BeanUtil.copyProperties(wbsParam, WbsParam.class);
+                                        if (param != null) {
+                                            param.setWbsId(wbsTreePrivate.getPKeyId());
+                                            param.setId(SnowFlakeUtil.getId());
+                                            paramListData.add(param);
+                                        }
+                                    }
                                 }
                             }
                         }
                     }
 
                 } else {
-                    //私有引用 - 获取私有树
+                    //私有引用 - 获取原始引用私有树
                     WbsTreePrivate treePrivateRootNode = baseMapper.selectOne(Wrappers.<WbsTreePrivate>query().lambda()
                             .eq(WbsTreePrivate::getPKeyId, wbsId)
                             .eq(WbsTreePrivate::getParentId, 0L)
                             .eq(WbsTreePrivate::getStatus, 1)
                             .eq(WbsTreePrivate::getType, 1)
                     );
-
                     List<WbsTreePrivate> treePrivateNodeAll = baseMapper.selectList(Wrappers.<WbsTreePrivate>query().lambda()
                             .eq(WbsTreePrivate::getWbsId, treePrivateRootNode.getWbsId())
+                            .eq(WbsTreePrivate::getProjectId, treePrivateRootNode.getProjectId())
                             .eq(WbsTreePrivate::getStatus, 1)
                             .eq(WbsTreePrivate::getType, 1)
                     );
@@ -521,10 +526,15 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                             if (wbsTreePrivateYS.getId().equals(wbsTreePrivate.getId())) {
                                 //获取公有节点参数
                                 List<WbsParam> wbsParamList = wbsParamListAll.stream().filter(f -> f.getWbsId().equals(wbsTreePrivateYS.getPKeyId())).collect(Collectors.toList());
-                                for (WbsParam wbsParam : wbsParamList) {
-                                    wbsParam.setWbsId(wbsTreePrivate.getPKeyId());
-                                    wbsParam.setId(SnowFlakeUtil.getId());
-                                    paramListData.add(wbsParam);
+                                if (wbsParamList.size() > 0) {
+                                    for (WbsParam wbsParam : wbsParamList) {
+                                        WbsParam param = BeanUtil.copyProperties(wbsParam, WbsParam.class);
+                                        if (param != null) {
+                                            param.setWbsId(wbsTreePrivate.getPKeyId());
+                                            param.setId(SnowFlakeUtil.getId());
+                                            paramListData.add(param);
+                                        }
+                                    }
                                 }
                             }
                         }