This commit is contained in:
itcsx committed 2026-09-15 20:44:09 +08:00
1 parent f2f5807372
commit 5d0b0c751a
16 files changed
+746 -10

No files matched your search

@@ -6,6 +6,7 @@ using CloudBuilder.Master.Data;
using CloudBuilder.Master.Entity;
using CloudBuilder.Master.Policy;
using CloudBuilder.Master.SearchCriteria;
using CloudBuilder.Master.Service.FamilyTreeUtility;
using CloudBuilder.Security.Data;
using CloudBuilder.Security.Entity;
using CloudBuilder.Security.Policy;
@@ -128,9 +129,11 @@ namespace CloudBuilder.Master.Service
if (data.FamilyTreePermissions.Any())
{
data.IsManager = data.FamilyTreePermissions.Where(x => x.UserName == service.UserId && x.ManagerIndc == YesNoPolicy.YES).Any();
if (data.IsManager) data.IsCanAmend = true;
}
if(!data.IsManager && data.FamilyTreePermissions.Any())
if (!data.IsManager && data.FamilyTreePermissions.Any())
{
data.FamilyTreePermissions = data.FamilyTreePermissions.Where(x => x.UserName == service.UserId && x.ValidIndc == YesNoPolicy.NO).ToArray();
}
@@ -186,6 +189,9 @@ namespace CloudBuilder.Master.Service
FillAvatarUrl(data.CurrentPerson.FamilyTreePersons);
}
if (!data.IsCanAmend)
data.IsCanAmend = new FamilyTreePermissionHelper(service).HasPermission(data.FamilyTree.TreeId, currentPerson);
return data;
}