wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
yangsong 2023-10-09 17:15:40 +08:00
parent 3427838bb6
commit dbd798f89e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureApplyServiceImpl.java
View File

@ -239,7 +239,7 @@ public class SaasFeatureApplyServiceImpl implements SaasFeatureApplyService {
} }
}); });
Set<Long> featureIds = details.stream().filter(s -> StringUtils.isNotBlank(s.getFeaturePath())) Set<Long> 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()); .map(Long::parseLong).collect(Collectors.toSet());
List<PermissionPointApplyVO.PermissionPointInfoVO> root; List<PermissionPointApplyVO.PermissionPointInfoVO> root;
if (CollectionUtils.isNotEmpty(featureIds)) { if (CollectionUtils.isNotEmpty(featureIds)) {
@ -379,7 +379,11 @@ public class SaasFeatureApplyServiceImpl implements SaasFeatureApplyService {
featurePath = ""; featurePath = "";
parentBusinessCode = ""; parentBusinessCode = "";
} else { } else {
featurePath = "/" + parent.getPermissionPointId() + "/"; if (StringUtils.isNotBlank(parent.getPath())) {
featurePath = parent.getPath() + parent.getPermissionPointId() + "/";
} else {
featurePath = "/" + parent.getPermissionPointId() + "/";
}
parentBusinessCode = parent.getBusinessNo(); parentBusinessCode = parent.getBusinessNo();
} }
pp.getChildren() pp.getChildren()