|
@@ -49,7 +49,7 @@ namespace VCommon.VApplication.Authorization
|
|
|
|
|
|
if (node.TenancySide != MultiTenancySides.Both && node.TenancySide != side) continue;
|
|
|
|
|
|
- if (customData != null && false == customData.Equals(node.CustomData)) continue;
|
|
|
+ if (node.CustomData != null && customData != null && false == customData.Equals(node.CustomData)) continue;
|
|
|
|
|
|
var copy = side == MultiTenancySides.Tenant
|
|
|
? new PermissionNodeOutput(node.Code, node.Name, node.Description)
|
|
@@ -57,7 +57,7 @@ namespace VCommon.VApplication.Authorization
|
|
|
|
|
|
output.Add(copy);
|
|
|
|
|
|
- FltTree(node.Children, side, licPerms, copy.Children);
|
|
|
+ FltTree(node.Children, side, licPerms, copy.Children, customData);
|
|
|
}
|
|
|
|
|
|
return output;
|