From 27eed8cf4dceba4e69be9905d7219e6cef5d0b52 Mon Sep 17 00:00:00 2001
From: lvshaohua <764616596@qq.com>
Date: Wed, 17 Apr 2024 10:30:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E5=8F=AA=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=AD=90=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=B8=8D=E6=9F=A5?=
 =?UTF-8?q?=E5=AD=90=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/permission/FeatureResourceController.java      | 3 ++-
 .../axzo/tyr/server/service/SaasFeatureResourceService.java   | 2 +-
 .../server/service/impl/SaasFeatureResourceServiceImpl.java   | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

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<FeatureResourceTreeNode> 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<SaasFeatureResource> 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)) {