底层节点

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

@@ -220,13 +220,13 @@ public class WbsParamServiceImpl extends BaseServiceImpl<WbsParamMapper, WbsPara
             if(wbsTreePrivate==null){
                 return R.success("暂无数据");
             }
-            String ancestor=wbsTreePrivate.getAncestors();
+            String ancestor=wbsTreePrivate.getAncestors()+","+wbsTreePrivate.getAncestorsPId();
             String[] ancestors = ancestor.split(",");
             List<Long> list2 = Arrays.stream(ancestors)
                 .map(Long::parseLong)
                 .collect(Collectors.toList());
             String join = String.join(",", list2.stream().map(String::valueOf).collect(Collectors.toList()));
-            String sql11 = "SELECT * FROM m_wbs_tree_private WHERE node_type=1 AND parent_id!=0 AND p_key_id IN (" + join + ")";
+            String sql11 = "SELECT * FROM m_wbs_tree_private WHERE node_type=1  AND project_id="+projectId+"  AND parent_id!=0 AND (p_key_id IN (" + join + ") or id IN ("+join+"))";
             List<WbsTreePrivate> nodeList = jdbcTemplate.query(sql11, new BeanPropertyRowMapper<>(WbsTreePrivate.class));
             //List<WbsTreePrivate> nodeList = wbsTreePrivateService.getBaseMapper().selectList(new LambdaQueryWrapper<>(WbsTreePrivate.class).select(WbsTreePrivate::getId).eq(WbsTreePrivate::getNodeType, 1).ne(WbsTreePrivate::getParentId, 0).in(WbsTreePrivate::getPKeyId, list2));
             List<Long> list3 = nodeList.stream().map(o -> o.getId()).collect(Collectors.toList());