Browse Source
Merge pull request #10922 from abpframework/auto-merge/rel-5-0/705
Merge branch dev with rel-5.0
pull/10951/head
maliming
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
7 additions and
2 deletions
-
modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs
|
|
|
@ -1,9 +1,11 @@ |
|
|
|
using System; |
|
|
|
using System; |
|
|
|
using System.Collections.Generic; |
|
|
|
using System.Linq; |
|
|
|
using System.Threading.Tasks; |
|
|
|
using JetBrains.Annotations; |
|
|
|
using Microsoft.AspNetCore.Authorization; |
|
|
|
using Microsoft.Extensions.Options; |
|
|
|
using Volo.Abp.Authorization.Permissions; |
|
|
|
using Volo.Abp.Features; |
|
|
|
|
|
|
|
namespace Volo.Abp.FeatureManagement; |
|
|
|
@ -71,7 +73,10 @@ public class FeatureAppService : FeatureManagementAppServiceBase, IFeatureAppSer |
|
|
|
|
|
|
|
SetFeatureDepth(groupDto.Features, providerName, providerKey); |
|
|
|
|
|
|
|
result.Groups.Add(groupDto); |
|
|
|
if (groupDto.Features.Any()) |
|
|
|
{ |
|
|
|
result.Groups.Add(groupDto); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
return result; |
|
|
|
|