根据别名搜索

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreePrivateMapper.xml

@@ -377,7 +377,12 @@
                 m_wbs_tree_private
                 WHERE
                 parent_id = d.id and is_deleted = 0 and type != 2
-            ) AS "has_children"
+            ) AS "has_children",
+            d.update_time AS "updateTime",
+            d.update_user AS "updateUser",
+            d.unique_code AS "uniqueCode",
+            d.partition_code AS "partitionCode",
+            (select name from blade_user where id = d.update_user) AS "updateUserName"
         FROM
             m_wbs_tree_private d
         WHERE
@@ -517,6 +522,7 @@
                wt.sort,
                wt.status,
                wt.node_type                                                                         AS nodeType,
+               wt.wbs_type                                                                          AS wbsType,
                wt.fill_rate                                                                         AS "fillRate",
                wt.html_url                                                                          AS htmlUrl,
                (SELECT count(1)

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

@@ -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::getImportMatchingInfo, 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::getFullName, queryValue)));
                     this.getParentNodesPublicWbs(wbsTrees, resultNodes);
                     resultNodes.addAll(wbsTrees);
                     List<WbsTreeQueryValueVO> wbsTreeQueryValueVOS = BeanUtil.copyProperties(resultNodes, WbsTreeQueryValueVO.class);
@@ -516,7 +516,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                     }
                 } else {//私有
                     Set<WbsTreePrivate> resultNodes = new HashSet<>();
-                    List<WbsTreePrivate> wbsTreePrivates = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>lambdaQuery().eq(WbsTreePrivate::getType, 1).eq(WbsTreePrivate::getWbsId, wbsId).eq(WbsTreePrivate::getProjectId, projectId).and(wrapper -> wrapper.like(WbsTreePrivate::getNodeName, queryValue).or().like(WbsTreePrivate::getImportMatchingInfo, queryValue)).and(wrapper -> wrapper.ne(WbsTreePrivate::getIsAddConceal, 1).or().isNull(WbsTreePrivate::getIsAddConceal)));
+                    List<WbsTreePrivate> wbsTreePrivates = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>lambdaQuery().eq(WbsTreePrivate::getType, 1).eq(WbsTreePrivate::getWbsId, wbsId).eq(WbsTreePrivate::getProjectId, projectId).and(wrapper -> wrapper.like(WbsTreePrivate::getNodeName, queryValue).or().like(WbsTreePrivate::getFullName, queryValue)));
                     this.getParentNodesPrivateWbs(wbsTreePrivates, resultNodes, projectId, wbsId);
                     resultNodes.addAll(wbsTreePrivates);
                     List<WbsTreePrivateQueryValueVO> wbsTreePrivateQueryValueVOS = BeanUtil.copyProperties(resultNodes, WbsTreePrivateQueryValueVO.class);