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));