diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java index 6d21fb9f..5401dc31 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java @@ -338,13 +338,13 @@ public class SrmsApiServiceImpl implements SrmsApiService { List listStandardTreeAll = new ArrayList<>(); // 国内标准 List listDomestic = lawsTreeNodeService.queryTreeNodeList(TableNameEnum.DOMESTIC_REGULATIONS.getValue(), nodeName, "1"); - getStandardTree(listStandardTreeAll, listDomestic); + getStandardTree(listStandardTreeAll, listDomestic,nodeName); // 海外标准 List listForeign = lawsTreeNodeService.queryTreeNodeList(TableNameEnum.FOREIGN_REGULATIONS.getValue(), nodeName, "1"); - getStandardTree(listStandardTreeAll, listForeign); + getStandardTree(listStandardTreeAll, listForeign,nodeName); // 企业标准 List listEnterprise = lawsTreeNodeService.queryTreeNodeList(TableNameEnum.ENTERPRISE_STANDARDS.getValue(), nodeName, "1"); - getStandardTree(listStandardTreeAll, listEnterprise); + getStandardTree(listStandardTreeAll, listEnterprise,nodeName); return Result.OK(listStandardTreeAll); }catch (Exception e){ log.error("获取所有体系数据异常:",e); @@ -352,7 +352,7 @@ public class SrmsApiServiceImpl implements SrmsApiService { } } - private void getStandardTree(List listStandardTreeAll, List listEnterprise) { + private void getStandardTree(List listStandardTreeAll, List listEnterprise,String nodeName) { if (!CollectionUtils.isEmpty(listEnterprise)) { Optional op = listEnterprise.stream().filter(o -> StringUtils.isBlank(o.getParentId())).findFirst(); if (op.isPresent()) { @@ -366,7 +366,13 @@ public class SrmsApiServiceImpl implements SrmsApiService { standardTree.setChildren(sub); } } - listStandardTreeAll.add(standardTree); + if(!StringUtils.isBlank(nodeName)){ + if(!CollectionUtils.isEmpty(lawsTreeNodeModel.getChildren()) || lawsTreeNodeModel.getNodeName().contains(nodeName)){ + listStandardTreeAll.add(standardTree); + } + }else{ + listStandardTreeAll.add(standardTree); + } } } }