From 08a1e556fede7977fe659e908eb9132e73ef17c4 Mon Sep 17 00:00:00 2001
From: lilong <lilong@axzo.cn>
Date: Wed, 14 Aug 2024 16:53:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:(REQ-2699)=20=E8=8F=9C=E5=8D=95=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=A0=91tree=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=8E=92=E9=99=A4=E9=BB=98=E8=AE=A4=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=9A=84=E5=85=A5=E5=8F=82=EF=BC=8C=E5=9B=A0=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=8D=E6=98=AF=E6=89=80=E6=9C=89=E9=9C=80=E6=B1=82=E9=83=BD?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/axzo/tyr/client/model/req/TreePermissionReq.java  | 5 +++++
 .../server/service/impl/PermissionQueryServiceImpl.java  | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/TreePermissionReq.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/TreePermissionReq.java
index 3ef4a3be..0cf9dfb4 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/TreePermissionReq.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/TreePermissionReq.java
@@ -68,4 +68,9 @@ public class TreePermissionReq {
      * 菜单跟页面元素绑定的类型
      */
     private Set<PageElementFeatureResourceRelationTypeEnum> pageElementTypes;
+
+    /**
+     * 默认会增加config配置的默认权限，不需要就传true
+     */
+    private Boolean excludeDefaultPermission;
 }
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionQueryServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionQueryServiceImpl.java
index 1ccdbd2d..2904f048 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionQueryServiceImpl.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionQueryServiceImpl.java
@@ -312,7 +312,12 @@ public class PermissionQueryServiceImpl implements PermissionQueryService {
      * 所以做了一个开关可以配置所有用户可以看到的菜单
      * @return
      */
-    private Set<Long> listNotAuthFeatureIds() {
+    private Set<Long> listNotAuthFeatureIds(TreePermissionReq req) {
+
+        if (BooleanUtils.isTrue(req.getExcludeDefaultPermission())) {
+            return Collections.emptySet();
+        }
+
         if (CollectionUtils.isEmpty(notAuthUniCodes)) {
             return Collections.emptySet();
         }
@@ -446,7 +451,7 @@ public class PermissionQueryServiceImpl implements PermissionQueryService {
         Set<Long> allFeatureIds = Sets.newHashSet();
         Set<Long> featureIds = resovlePermission(req);
 
-        Set<Long> defaultFeatureIds = listNotAuthFeatureIds();
+        Set<Long> defaultFeatureIds = listNotAuthFeatureIds(req);
         allFeatureIds.addAll(featureIds);
         allFeatureIds.addAll(defaultFeatureIds);