|
@@ -503,7 +503,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
|
|
|
if (("1").equals(type)) {//节点
|
|
|
if (ObjectUtil.isEmpty(projectId)) {//公有
|
|
|
Set<WbsTree> resultNodes = new HashSet<>();
|
|
|
- List<WbsTree> wbsTrees = baseMapper.selectList(Wrappers.<WbsTree>lambdaQuery().eq(WbsTree::getType, 1).eq(WbsTree::getWbsId, wbsId).and(wrapper -> wrapper.like(WbsTree::getNodeName, queryValue).or().like(WbsTree::getFullName, queryValue)));
|
|
|
+ List<WbsTree> wbsTrees = baseMapper.selectList(Wrappers.<WbsTree>lambdaQuery().eq(WbsTree::getType, 1).eq(WbsTree::getWbsId, wbsId).and(wrapper -> wrapper.like(WbsTree::getNodeName, queryValue).or().like(WbsTree::getImportMatchingInfo, queryValue)));
|
|
|
this.getParentNodesPublicWbs(wbsTrees, resultNodes);
|
|
|
resultNodes.addAll(wbsTrees);
|
|
|
List<WbsTreeQueryValueVO> wbsTreeQueryValueVOS = BeanUtil.copyProperties(resultNodes, WbsTreeQueryValueVO.class);
|