From ce5549797734b04ec3e328a91e8e52e9bdc01b6c Mon Sep 17 00:00:00 2001 From: Hanpaopao <510423039@qq.com> Date: Fri, 10 Jan 2025 21:51:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=9D=83=E9=99=90bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docs.yml | 18 ------------------ ...AbpProApplicationConfigurationAppService.cs | 6 ++++++ 2 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 .github/workflows/docs.yml diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml deleted file mode 100644 index 703a9d55..00000000 --- a/.github/workflows/docs.yml +++ /dev/null @@ -1,18 +0,0 @@ -# name: Docs -# on: -# push: -# branches: -# - main -# jobs: -# build-docs-and-deploy: -# runs-on: ubuntu-latest -# steps: -# - name: Checkout 🛎️ -# uses: actions/checkout@v2 -# with: -# persist-credentials: false -# - name: Deploy docs 🚀 -# uses: mhausenblas/mkdocs-deploy-gh-pages@master -# env: -# GITHUB_TOKEN: ${{ secrets.TOKEN }} -# CONFIG_FILE: docs/mkdocs.yml diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/ApplicationConfigurations/AbpProApplicationConfigurationAppService.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/ApplicationConfigurations/AbpProApplicationConfigurationAppService.cs index 21613f1d..dee3f48b 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/ApplicationConfigurations/AbpProApplicationConfigurationAppService.cs +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/ApplicationConfigurations/AbpProApplicationConfigurationAppService.cs @@ -213,6 +213,12 @@ public class AbpProApplicationConfigurationAppService : ApplicationService, IAbp if (currentPolicyValue.Value == PermissionGrantResult.Granted) { result.Add(currentPolicy); + // 获取上级code + var parent = currentPolicy.Split('.', StringSplitOptions.RemoveEmptyEntries); + if (parent.Length > 1) + { + result.Add(parent[0]); + } } result.AddRange(GetPolicy(currentPolicy, permissions));