diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureApplyServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureApplyServiceImpl.java index 72287230..5f2710c6 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureApplyServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureApplyServiceImpl.java @@ -239,7 +239,7 @@ public class SaasFeatureApplyServiceImpl implements SaasFeatureApplyService { } }); Set featureIds = details.stream().filter(s -> StringUtils.isNotBlank(s.getFeaturePath())) - .flatMap(l -> Arrays.stream(l.getFeaturePath().split("/"))).filter(StringUtils::isNotBlank) + .flatMap(l -> Arrays.stream(l.getFeaturePath().split("/"))).filter(e -> StringUtils.isNotBlank(e) || StringUtils.equals("0", e)) .map(Long::parseLong).collect(Collectors.toSet()); List root; if (CollectionUtils.isNotEmpty(featureIds)) { @@ -379,7 +379,11 @@ public class SaasFeatureApplyServiceImpl implements SaasFeatureApplyService { featurePath = ""; parentBusinessCode = ""; } else { - featurePath = "/" + parent.getPermissionPointId() + "/"; + if (StringUtils.isNotBlank(parent.getPath())) { + featurePath = parent.getPath() + parent.getPermissionPointId() + "/"; + } else { + featurePath = "/" + parent.getPermissionPointId() + "/"; + } parentBusinessCode = parent.getBusinessNo(); } pp.getChildren()