diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/FeatureResourceController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/FeatureResourceController.java index 5b3f736e..763f2640 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/FeatureResourceController.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/FeatureResourceController.java @@ -78,7 +78,8 @@ public class FeatureResourceController implements FeatureResourceApi { @Override public ApiResult detail(Long featureId) { - return ApiResult.ok(featureResourceService.getTreeFeatureDescendant(featureId)); + // 详情只查子集组件 + return ApiResult.ok(featureResourceService.getTreeFeatureDescendant(featureId, 4)); } @Override diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasFeatureResourceService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasFeatureResourceService.java index ef4cfa6c..2a84685d 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasFeatureResourceService.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasFeatureResourceService.java @@ -29,7 +29,7 @@ public interface SaasFeatureResourceService { SaasFeatureResource featureResourceById(Long featureId); - FeatureResourceTreeNode getTreeFeatureDescendant(Long featureId); + FeatureResourceTreeNode getTreeFeatureDescendant(Long featureId, Integer featureType); /**删除指定菜单**/ void deleteMenuFeature(Long featureId, Long operatorId); diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java index 4f7da7b6..cf42dc6d 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java @@ -31,6 +31,7 @@ import cn.azxo.framework.common.utils.StringUtils; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.BooleanUtil; +import cn.hutool.core.util.ObjectUtil; import com.google.common.collect.Lists; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -159,9 +160,10 @@ public class SaasFeatureResourceServiceImpl implements SaasFeatureResourceServic } @Override - public FeatureResourceTreeNode getTreeFeatureDescendant(Long featureId) { + public FeatureResourceTreeNode getTreeFeatureDescendant(Long featureId, Integer featureType) { List descendants = featureResourceDao.lambdaQuery() .eq(BaseEntity::getIsDelete,0) + .eq(ObjectUtil.isNotNull(featureType), SaasFeatureResource::getFeatureType, featureType) .apply("FIND_IN_SET('" + featureId + "', path)") .list(); if (CollectionUtil.isEmpty(descendants)) {