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 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 listNotAuthFeatureIds() { + private Set 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 allFeatureIds = Sets.newHashSet(); Set featureIds = resovlePermission(req); - Set defaultFeatureIds = listNotAuthFeatureIds(); + Set defaultFeatureIds = listNotAuthFeatureIds(req); allFeatureIds.addAll(featureIds); allFeatureIds.addAll(defaultFeatureIds);