bug: 修复EntityRole的FilterGroup为null时的异常

dotnetcore · Feb 27, 2024 · 8e82062 · 8e82062
1 parent 3b211ee
commit 8e82062
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 27 deletions.
diff --git a/samples/web/Liuliu.Demo.Core/Authorization/Dtos/EntityRoleOutputDto.cs b/samples/web/Liuliu.Demo.Core/Authorization/Dtos/EntityRoleOutputDto.cs
@@ -1,4 +1,4 @@
-// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
 //  <copyright file="EntityRoleOutputDto.cs" company="OSharp开源团队">
 //      Copyright (c) 2014-2018 OSharp. All rights reserved.
 //  </copyright>
@@ -43,7 +43,7 @@ public EntityRoleOutputDto(EntityRole entityRole)
             IsLocked = entityRole.IsLocked;
             Operation = entityRole.Operation;
             CreatedTime = entityRole.CreatedTime;
-            FilterGroup = entityRole.FilterGroupJson.FromJsonString<FilterGroup>();
+            FilterGroup = entityRole.FilterGroup;
         }
 
         /// <summary>

diff --git a/src/OSharp.Authorization.Datas/DataAuthCacheBase.cs b/src/OSharp.Authorization.Datas/DataAuthCacheBase.cs
@@ -54,7 +54,11 @@ public virtual void BuildCaches()
 
         foreach (var entityRole in entityRoles)
         {
-            FilterGroup filterGroup = entityRole.FilterGroupJson.FromJsonString<FilterGroup>();
+            FilterGroup filterGroup = entityRole.FilterGroupJson?.FromJsonString<FilterGroup>();
+            if (filterGroup == null)
+            {
+                continue;
+            }
             string key = GetKey(entityRole.RoleName, entityRole.EntityTypeFullName, entityRole.Operation);
             string name = GetName(entityRole.RoleName, entityRole.EntityTypeFullName, entityRole.Operation);
 

diff --git a/src/OSharp.Authorization.Datas/DataAuthorizationManagerBase.cs b/src/OSharp.Authorization.Datas/DataAuthorizationManagerBase.cs
@@ -122,7 +122,6 @@ public virtual async Task<OperationResult> CreateEntityRoles(params TEntityRoleI
     {
         Check2.Validate<TEntityRoleInputDto, Guid>(dtos, nameof(dtos));
 
-        DataAuthCacheRefreshEventData eventData = new DataAuthCacheRefreshEventData();
         OperationResult result = await EntityRoleRepository.InsertAsync(dtos,
             async dto =>
             {
@@ -143,28 +142,7 @@ public virtual async Task<OperationResult> CreateEntityRoles(params TEntityRoleI
                     throw new OsharpException($"角色“{role.Name}”和实体“{entityInfo.Name}”和操作“{dto.Operation}”的数据权限规则已存在，不能重复添加");
                 }
 
-            },
-            async (dto, entity) =>
-            {
-                if (!dto.IsLocked)
-                {
-                    TRole role = await RoleRepository.GetAsync(dto.RoleId);
-                    TEntityInfo entityInfo = await EntityInfoRepository.GetAsync(dto.EntityId);
-                    eventData.SetItems.Add(new DataAuthCacheItem()
-                    {
-                        RoleName = role.Name,
-                        EntityTypeFullName = entityInfo.TypeName,
-                        Operation = entity.Operation,
-                        FilterGroup = entity.FilterGroup
-                    });
-                }
-
-                return entity;
             });
-        if (result.Succeeded && eventData.HasData())
-        {
-            await EventBus.PublishAsync(eventData);
-        }
 
         return result;
     }
@@ -211,7 +189,7 @@ public virtual async Task<OperationResult> UpdateEntityRoles(params TEntityRoleI
                 {
                     eventData.RemoveItems.Add(cacheItem);
                 }
-                else
+                else if(entity.FilterGroup != null)
                 {
                     eventData.SetItems.Add(cacheItem);
                 }

diff --git a/src/OSharp.Hosting.Core/Authorization/Dtos/EntityRoleOutputDto.cs b/src/OSharp.Hosting.Core/Authorization/Dtos/EntityRoleOutputDto.cs
@@ -35,7 +35,7 @@ public EntityRoleOutputDto(EntityRole entityRole)
         IsLocked = entityRole.IsLocked;
         Operation = entityRole.Operation;
         CreatedTime = entityRole.CreatedTime;
-        FilterGroup = entityRole.FilterGroupJson.FromJsonString<FilterGroup>();
+        FilterGroup = entityRole.FilterGroup;
     }
 
     /// <summary>