Browse Source

解决质检资料查询页面查询出已隐藏的节点资料

lvy 1 day ago
parent
commit
85d326d677

+ 2 - 2
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -1485,7 +1485,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
                         try {
                             List<WbsTreeContractLazyVO> query = jdbcTemplate.query(
                                     "SELECT p_key_id,id,parent_id " +
-                                            ",sort,create_time,IFNULL(if(LENGTH (trim(full_name)) > 0, full_name, node_name), node_name) AS fullName " +
+                                            ",sort,create_time,IFNULL(if(LENGTH (trim(full_name)) > 0, full_name, node_name), node_name) AS fullName, is_buss_show " +
                                             "FROM m_wbs_tree_contract " +
                                             "WHERE type = 1 " +
                                             "AND status = 1 " +
@@ -2320,7 +2320,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
         if (obj != null) {
             List<Long> resultPKeyId = new ArrayList<>();
             List<WbsTreeContractLazyVO> nodeAll = this.getNodeAll(obj.getContractId());
-            Map<Long, List<WbsTreeContractLazyVO>> map = nodeAll.stream().collect(Collectors.groupingBy(WbsTreeContractLazyVO::getParentId));
+            Map<Long, List<WbsTreeContractLazyVO>> map = nodeAll.stream().filter(item -> item.getIsBussShow() == null || !Objects.equals(item.getIsBussShow(), "2")).collect(Collectors.groupingBy(WbsTreeContractLazyVO::getParentId));
             this.recursionGetChildNodesPkeyIds(map, Collections.singletonList(obj.getId()), resultPKeyId, lowestNodesPkeyIds);
             if (resultPKeyId.size() > 0) {
                 return resultPKeyId;