ow

CloudBuilder/CloudBuilder.Master.Service/DmsFileService.auto.cs

@@ -987,6 +987,10 @@ namespace CloudBuilder.Master.Service
             repositoryUpload.UpdateNow(upload);
 
             DmsFileEntity file = repository.DetachedEntities.Where(x => x.FileId == dmsFile.FileId).FirstOrDefault()!;
+            // 主表 OrgFileName 是列表显示/下载名的权威来源，重命名必须同步（历史上只改 upload 表，前端列表名字改不动）；
+            // 注意只同步 OrgFileName，主表 FileName 是 FL 编号不能拿新名覆盖
+            file.OrgFileName = dmsFile.FileName;
+            repository.UpdateNow(file);
             //修改目录档对应的名称
             IRepository<DmsFolderEntity> repositoryFolder = repository.GetRepository<IRepository<DmsFolderEntity>>();
             DmsFolderEntity dmsFolder = repositoryFolder.DetachedEntities.Where(x => x.FolderName == file.FileName).FirstOrDefault()!;
@@ -1683,7 +1687,8 @@ namespace CloudBuilder.Master.Service
             entity.OrderKey = dmsFile.OrderKey;
             entity.FileName = upload.UploadName;
             entity.FileType = FileTypePolicy.GetType(entity.OrderKey);
-            entity.OrgFileName = dmsFile.FileName;
+            // 主表必须存原始文件名（前端 multipart 字段名），不能存 dmsFile.FileName 物理分片名，否则下载时拿到的就是系统保存名
+            entity.OrgFileName = dmsFile.OrgFileName;
             entity.FileSize = dmsFile.FileSize;
             entity.AllowDeleteIndc = entity.AllowRenameIndc = YesNoPolicy.YES;
             entity.IsDirectoryIndc = YesNoPolicy.NO;

CloudBuilder/CloudBuilder.Master.Service/FamilyPersonService.auto.cs

@@ -116,6 +116,13 @@ namespace CloudBuilder.Master.Service
                 throw new ValidatedException("记录已存在.");
             }
 
+            // 新增人没有既有 PersonId 可查支系，最小闸门：管理员或本谱已生效成员才能往谱里造人（防普通用户直接调 API 污染族谱）
+            var helper = new FamilyTreePermissionHelper(service);
+            if (!helper.IsManager(data.FamilyPerson.TreeId) && !helper.IsMember(data.FamilyPerson.TreeId))
+            {
+                throw new ValidatedException("您没有新增权限.");
+            }
+
             ValidateHelper.Validate(service, data.FamilyPerson, FamilyPersonEntity.DB_NAME_FAMILY_PERSON);
 
             d = new FamilyPersonEntity();
@@ -163,7 +170,15 @@ namespace CloudBuilder.Master.Service
         public void Delete(string key)
         {
             var ent = repository.DetachedEntities.Where(x => x.PersonId == key).FirstOrDefault()!;
-            if (ent != null) { repository.DeleteNow(ent); }
+            if (ent == null) return;
+
+            // 删人与改人口径一致：需在该人所属支系内（管理员在 HasPermission 内短路为真）
+            if (!new FamilyTreePermissionHelper(service).HasPermission(ent.TreeId, ent.PersonId))
+            {
+                throw new ValidatedException("您没有删除权限.");
+            }
+
+            repository.DeleteNow(ent);
         }
 
         [PermissionOperate(name: MasterPermissionPolicy.FamilyPerson, operate: Operate.Delete)]

CloudBuilder/CloudBuilder.Master.Service/FamilyTreeService.auto.cs

@@ -131,6 +131,12 @@ namespace CloudBuilder.Master.Service
                 data.IsManager = data.FamilyTreePermissions.Where(x => x.UserName == service.UserId && x.ManagerIndc == YesNoPolicy.YES).Any();
 
                 if (data.IsManager) data.IsCanAmend = true;
+
+                // 成员口径：有绑定到自己且已生效的权限行即算（与锚点是否可编无关，供前端选项卡级控权）；需在下方过滤名单前算，否则非管理员只剩待审行
+                var selfValidRows = data.FamilyTreePermissions.Where(x => x.UserName == service.UserId && x.ValidIndc == YesNoPolicy.YES).ToArray();
+                data.IsMember = selfValidRows.Any();
+                // 自己绑定的族员（供前端切换「绑定账号/解除绑定」按钮），管理员无绑定概念不下发
+                if (!data.IsManager) data.SelfBindPersonId = selfValidRows.Select(x => x.PersonId).FirstOrDefault() ?? "";
             }
 
             if (!data.IsManager && data.FamilyTreePermissions.Any())
@@ -164,14 +170,16 @@ namespace CloudBuilder.Master.Service
 
             IRepository<FamilyTreeSpouseMapViewEntity> repositorySpouseMap = repository.GetRepository<IRepository<FamilyTreeSpouseMapViewEntity>>();
 
-            data.CurrentPerson.FamilyTreeSpouseMaps = repositorySpouseMap.GetRepository<IRepository<FamilyTreeSpouseMapViewEntity>>().DetachedEntities.Where(x => x.PersonId == currentPerson).OrderBy(x => x.Orderby).ToArray();
+            data.CurrentPerson.FamilyTreeSpouseMaps = repositorySpouseMap.GetRepository<IRepository<FamilyTreeSpouseMapViewEntity>>().DetachedEntities.Where(x => x.PersonId == currentPerson && x.TreeId == d.TreeId).OrderBy(x => x.Orderby).ToArray();
 
             //data.CurrentPerson.FamilyTreeParentMaps = repositoryChildrenMap.GetRepository<IRepository<FamilyTreeChildrenMapViewEntity>>().DetachedEntities.Where(x => x.ChildrenId == key).OrderBy(x => x.Orderby).ToArray();
-            data.CurrentPerson.FamilyTreeChildrenMaps = repositoryChildrenMap.GetRepository<IRepository<FamilyTreeChildrenMapViewEntity>>().DetachedEntities.Where(x => x.PersonId == currentPerson).OrderBy(x => x.Orderby).ToArray();
+            data.CurrentPerson.FamilyTreeChildrenMaps = repositoryChildrenMap.GetRepository<IRepository<FamilyTreeChildrenMapViewEntity>>().DetachedEntities.Where(x => x.PersonId == currentPerson && x.TreeId == d.TreeId).OrderBy(x => x.Orderby).ToArray();
 
             // 补充当前人员及其配偶、子女的人员信息（含头像地址），供谱系图卡片显示头像
             List<string> ps = new List<string>();
             if (!string.IsNullOrEmpty(currentPerson)) ps.Add(currentPerson);
+            // 始祖恒定并入下发集合：切换当前族员后，前端「始祖信息」卡仍需回查始祖档案（Distinct 去重）
+            if (!string.IsNullOrEmpty(d.AncestorPersonId)) ps.Add(d.AncestorPersonId);
             if (data.CurrentPerson.FamilyTreeSpouseMaps != null)
             {
                 ps.AddRange(data.CurrentPerson.FamilyTreeSpouseMaps.Select(x => x.SpouseId).ToArray());
@@ -192,6 +200,10 @@ namespace CloudBuilder.Master.Service
             if (!data.IsCanAmend)
                 data.IsCanAmend = new FamilyTreePermissionHelper(service).HasPermission(data.FamilyTree.TreeId, currentPerson);
 
+            // 逐个目标人的可编集合（关系行里的旁支靠它隐藏编辑/删除钮）；管理员全量可编不限量不下发
+            if (!data.IsManager && data.IsMember)
+                data.CanAmendPersonIds = new FamilyTreePermissionHelper(service).GetAmendablePersonIds(data.FamilyTree.TreeId).ToArray();
+
             return data;
         }
 
@@ -297,9 +309,9 @@ namespace CloudBuilder.Master.Service
             if (data.CurrentPerson != null && data.CurrentPerson.FamilyTreeChildrenMaps != null && data.CurrentPerson.FamilyTreeChildrenMaps.Length > 0)
                 data.CurrentPerson.FamilyTreeChildrenMaps.ToLookup(x => x.TreeId = d.TreeId);
 
-            SaveSpouseMaps(currentPerson, data.CurrentPerson.FamilyTreeSpouseMaps);
+            SaveSpouseMaps(d.TreeId, currentPerson, data.CurrentPerson.FamilyTreeSpouseMaps);
             //SaveParentMaps(data.CurrentPerson.FamilyPerson.PersonId, data.CurrentPerson.FamilyTreeParentMaps);
-            SaveSonMaps(currentPerson, data.CurrentPerson.FamilyTreeChildrenMaps);
+            SaveSonMaps(d.TreeId, currentPerson, data.CurrentPerson.FamilyTreeChildrenMaps);
 
             return FindByCurrentPerson(d.TreeId, currentPerson);
         }
@@ -316,30 +328,87 @@ namespace CloudBuilder.Master.Service
         public void RequestFamilyTreePermission(string treeId, string currentPersonId)
         {
             IRepository<FamilyTreePermissionEntity> repositoryPermission = repository.GetRepository<IRepository<FamilyTreePermissionEntity>>();
-            FamilyTreePermissionEntity treePermissionEntity = repositoryPermission.DetachedEntities.Where(x => x.TreeId == treeId && x.PersonId == currentPersonId && service.UserId == x.UserName).FirstOrDefault()!;
+            // 一人一谱一行：PersonId 不再参与定位与绑定（申请锚点≠本人），查重按 TreeId+UserName
+            FamilyTreePermissionEntity treePermissionEntity = repositoryPermission.DetachedEntities.Where(x => x.TreeId == treeId && service.UserId == x.UserName).FirstOrDefault()!;
 
             if (treePermissionEntity != null) return;
 
             treePermissionEntity = new FamilyTreePermissionEntity();
             treePermissionEntity.TreeId = treeId;
-            treePermissionEntity.PersonId = currentPersonId;
+            // 申请时不绑定任何族员（旧口径把申请锚点——往往是始祖——绑了进去，导致成员误得大支系）；
+            // 绑定时机：审批时按中文姓名同名唯一自动绑，或通过后由用户自行「绑定账号」
+            treePermissionEntity.PersonId = "";
             treePermissionEntity.UserName = service.UserId;
             treePermissionEntity.ManagerIndc = YesNoPolicy.NO;
             treePermissionEntity.ValidIndc = YesNoPolicy.NO;
             InsertFamilyTreePermission(treePermissionEntity);
         }
 
+        /// <summary>
+        /// PersonId 属复合主键 (PersonId,TreeId,UserName)，EF 分离实体直接改主键列更新不可靠，换绑一律删旧行插新行
+        /// </summary>
+        private void RebindFamilyTreePermission(FamilyTreePermissionEntity row, string personId)
+        {
+            IRepository<FamilyTreePermissionEntity> repositoryPermission = repository.GetRepository<IRepository<FamilyTreePermissionEntity>>();
+
+            FamilyTreePermissionEntity fresh = new FamilyTreePermissionEntity();
+            fresh.TreeId = row.TreeId;
+            fresh.UserName = row.UserName;
+            fresh.PersonId = personId;
+            fresh.ManagerIndc = row.ManagerIndc;
+            fresh.ValidIndc = row.ValidIndc;
+
+            repositoryPermission.DeleteNow(row);
+            repositoryPermission.InsertNow(fresh);
+        }
+
+        /// <summary>
+        /// 用户中文姓名（security_user.user_local_name）；登录账号只是标识，不参与同名比较
+        /// </summary>
+        private string GetUserLocalName(string userName)
+        {
+            IRepository<SecurityUserEntity> repositoryUser = repository.GetRepository<IRepository<SecurityUserEntity>>();
+            return repositoryUser.DetachedEntities.Where(x => x.UserName == userName).FirstOrDefault()?.UserLocalName ?? "";
+        }
+
+        /// <summary>
+        /// 同名口径：族员「姓+谱名」组合或常用名与用户中文姓名相同
+        /// </summary>
+        private bool IsMatchedByLocalName(FamilyPersonEntity person, string localName)
+        {
+            if (string.IsNullOrEmpty(localName)) return false;
+            return (person.Surname ?? "") + (person.GenealogyName ?? "") == localName || person.CommonName == localName;
+        }
+
         [PermissionOperate(name: MasterPermissionPolicy.FamilyTree, operate: Operate.Find)]
         [UnitOfWork]
         public void ApproveFamilyTreePermission(string treeId, string currentPersonId, string userName, string managerIndc)
         {
             IRepository<FamilyTreePermissionEntity> repositoryPermission = repository.GetRepository<IRepository<FamilyTreePermissionEntity>>();
-            FamilyTreePermissionEntity treePermissionEntity = repositoryPermission.DetachedEntities.Where(x => x.TreeId == treeId && x.PersonId == currentPersonId && userName == x.UserName).FirstOrDefault()!;
+            // 行定位不再用 PersonId（申请行已不绑族员，旧数据也可能已换绑），TreeId+UserName 即唯一行
+            FamilyTreePermissionEntity treePermissionEntity = repositoryPermission.DetachedEntities.Where(x => x.TreeId == treeId && userName == x.UserName).FirstOrDefault()!;
             if (treePermissionEntity == null) return;
 
             treePermissionEntity.ManagerIndc = managerIndc;
             treePermissionEntity.ValidIndc = YesNoPolicy.YES;
 
+            // 通过为成员：不绑始祖；用户中文姓名与「姓+谱名」或常用名相同且全谱唯一才自动绑定，否则留空由用户自行「绑定账号」
+            if (managerIndc != YesNoPolicy.YES)
+            {
+                string localName = GetUserLocalName(userName);
+                IRepository<FamilyPersonEntity> repositoryPerson = repository.GetRepository<IRepository<FamilyPersonEntity>>();
+                // 姓+谱名是运行时拼接，EF 翻不动就拉全谱内存筛（单谱人数量级小）
+                FamilyPersonEntity[] matches = repositoryPerson.DetachedEntities.Where(x => x.TreeId == treeId).ToArray()
+                    .Where(x => IsMatchedByLocalName(x, localName)).ToArray();
+                string boundPersonId = matches.Length == 1 ? matches[0].PersonId : "";
+
+                if (treePermissionEntity.PersonId != boundPersonId)
+                {
+                    RebindFamilyTreePermission(treePermissionEntity, boundPersonId);
+                    return;
+                }
+            }
+
             repositoryPermission.UpdateNow(treePermissionEntity);
         }
 
@@ -348,28 +417,74 @@ namespace CloudBuilder.Master.Service
         public void RejectFamilyTreePermission(string treeId, string currentPersonId, string userName)
         {
             IRepository<FamilyTreePermissionEntity> repositoryPermission = repository.GetRepository<IRepository<FamilyTreePermissionEntity>>();
-            FamilyTreePermissionEntity treePermissionEntity = repositoryPermission.DetachedEntities.Where(x => x.TreeId == treeId && x.PersonId == currentPersonId && userName == x.UserName).FirstOrDefault()!;
+            FamilyTreePermissionEntity treePermissionEntity = repositoryPermission.DetachedEntities.Where(x => x.TreeId == treeId && userName == x.UserName).FirstOrDefault()!;
             if (treePermissionEntity == null) return;
 
             repositoryPermission.DeleteNow(treePermissionEntity);
         }
 
-        private void SaveSpouseMaps(string personId, FamilyTreeSpouseMapViewEntity[] maps)
+        /// <summary>
+        /// 绑定账号：把当前族员绑到自己已生效的权限行（仅限与登录中文姓名同名的族员）；
+        /// 返回绑定后的详情数据（锚点切到刚绑的族员）
+        /// </summary>
+        [PermissionOperate(name: MasterPermissionPolicy.FamilyTree, operate: Operate.Find)]
+        [UnitOfWork]
+        public FamilyTreeData BindSelfPerson(string treeId, string personId)
+        {
+            IRepository<FamilyTreePermissionEntity> repositoryPermission = repository.GetRepository<IRepository<FamilyTreePermissionEntity>>();
+            FamilyTreePermissionEntity row = repositoryPermission.DetachedEntities.Where(x => x.TreeId == treeId && x.UserName == service.UserId && x.ValidIndc == YesNoPolicy.YES).FirstOrDefault()!;
+            if (row == null) throw new ValidatedException("您还未通过审批，不能绑定账号.");
+
+            IRepository<FamilyPersonEntity> repositoryPerson = repository.GetRepository<IRepository<FamilyPersonEntity>>();
+            FamilyPersonEntity person = repositoryPerson.DetachedEntities.Where(x => x.TreeId == treeId && x.PersonId == personId).FirstOrDefault()!;
+            if (person == null) throw new ValidatedException("族员不存在.");
+
+            // 同名口径：族员「姓+谱名」组合或常用名与登录中文姓名相同才可绑定（与管理员审批自动绑定同一把尺）
+            if (!IsMatchedByLocalName(person, GetUserLocalName(service.UserId)))
+                throw new ValidatedException("只能绑定与您的中文姓名同名的族员.");
+
+            if (row.PersonId != personId) RebindFamilyTreePermission(row, personId);
+
+            return FindByCurrentPerson(treeId, personId);
+        }
+
+        /// <summary>
+        /// 解除绑定：把自己已生效权限行的 PersonId 置空（锚点回到始祖），解绑后可重新「绑定账号」
+        /// </summary>
+        [PermissionOperate(name: MasterPermissionPolicy.FamilyTree, operate: Operate.Find)]
+        [UnitOfWork]
+        public FamilyTreeData UnbindSelfPerson(string treeId)
+        {
+            IRepository<FamilyTreePermissionEntity> repositoryPermission = repository.GetRepository<IRepository<FamilyTreePermissionEntity>>();
+            FamilyTreePermissionEntity row = repositoryPermission.DetachedEntities.Where(x => x.TreeId == treeId && x.UserName == service.UserId && x.ValidIndc == YesNoPolicy.YES).FirstOrDefault()!;
+            if (row == null) throw new ValidatedException("您还未通过审批，不能解除绑定.");
+
+            if (!string.IsNullOrEmpty(row.PersonId)) RebindFamilyTreePermission(row, "");
+
+            return FindByCurrentPerson(treeId, "");
+        }
+
+        private void SaveSpouseMaps(string treeId, string personId, FamilyTreeSpouseMapViewEntity[] maps)
         {
             IRepository<FamilyTreeSpouseMapViewEntity> repositoryMapView = repository.GetRepository<IRepository<FamilyTreeSpouseMapViewEntity>>();
             IRepository<FamilyTreeSpouseMapEntity> repositoryMap = repository.GetRepository<IRepository<FamilyTreeSpouseMapEntity>>();
             IRepository<FamilyPersonEntity> repositoryPerson = repository.GetRepository<IRepository<FamilyPersonEntity>>();
             FamilyPersonEntity familyPerson;
 
-            FamilyTreeSpouseMapViewEntity[] olds = repositoryMapView.Entities.Where(x => x.PersonId == personId).ToArray();
+            FamilyTreeSpouseMapViewEntity[] olds = repositoryMapView.Entities.Where(x => x.TreeId == treeId && x.PersonId == personId).ToArray();
             if (olds != null && olds.Length > 0)
             {
                 foreach (FamilyTreeSpouseMapViewEntity old in olds)
                 {
-                    familyPerson = repositoryPerson.DetachedEntities.Where(x => x.PersonId == old.PersonId).FirstOrDefault()!;
-                    if (familyPerson != null)
+                    // 仅当新载荷不再保留该配偶时才连带删其人员档案；原写法误用 old.PersonId（父辈本人），
+                    // 会把父辈 family_person 行删掉，导致子女 view 联查丢行、SaveSonMaps 查不到旧行不删，重插同主键报 Duplicate entry
+                    if (maps == null || !maps.Any(m => m.SpouseId == old.SpouseId))
                     {
-                        repositoryPerson.DeleteNow(familyPerson);
+                        familyPerson = repositoryPerson.DetachedEntities.Where(x => x.PersonId == old.SpouseId).FirstOrDefault()!;
+                        if (familyPerson != null)
+                        {
+                            repositoryPerson.DeleteNow(familyPerson);
+                        }
                     }
 
                     repositoryMap.DeleteNow(new FamilyTreeSpouseMapEntity()
@@ -412,22 +527,26 @@ namespace CloudBuilder.Master.Service
         }
 
 
-        private void SaveSonMaps(string personId, FamilyTreeChildrenMapViewEntity[] maps)
+        private void SaveSonMaps(string treeId, string personId, FamilyTreeChildrenMapViewEntity[] maps)
         {
             IRepository<FamilyTreeChildrenMapViewEntity> repositoryMapView = repository.GetRepository<IRepository<FamilyTreeChildrenMapViewEntity>>();
             IRepository<FamilyTreeChildrenMapEntity> repositoryMap = repository.GetRepository<IRepository<FamilyTreeChildrenMapEntity>>();
             IRepository<FamilyPersonEntity> repositoryPerson = repository.GetRepository<IRepository<FamilyPersonEntity>>();
             FamilyPersonEntity familyPerson;
 
-            FamilyTreeChildrenMapViewEntity[] olds = repositoryMapView.Entities.Where(x => x.PersonId == personId).ToArray();
+            FamilyTreeChildrenMapViewEntity[] olds = repositoryMapView.Entities.Where(x => x.TreeId == treeId && x.PersonId == personId).ToArray();
             if (olds != null && olds.Length > 0)
             {
                 foreach (FamilyTreeChildrenMapViewEntity old in olds)
                 {
-                    familyPerson = repositoryPerson.DetachedEntities.Where(x => x.PersonId == old.PersonId).FirstOrDefault()!;
-                    if (familyPerson != null)
+                    // 同 SaveSpouseMaps：只在该子女不再被新载荷保留时才连带删档案，且删的是子女而非父辈
+                    if (maps == null || !maps.Any(m => m.ChildrenId == old.ChildrenId))
                     {
-                        repositoryPerson.DeleteNow(familyPerson);
+                        familyPerson = repositoryPerson.DetachedEntities.Where(x => x.PersonId == old.ChildrenId).FirstOrDefault()!;
+                        if (familyPerson != null)
+                        {
+                            repositoryPerson.DeleteNow(familyPerson);
+                        }
                     }
 
                     repositoryMap.DeleteNow(new FamilyTreeChildrenMapEntity()
@@ -490,29 +609,42 @@ namespace CloudBuilder.Master.Service
 
             Validate(data.FamilyTree);
 
-            var has = new FamilyTreePermissionHelper(service).HasPermission(d.TreeId, d.AncestorPersonId);
-
-            if (!has)
-            {
-                throw new ValidatedException("您没有修改权限.");
-            }
-
-            ObjectCopyHelper.Copy(data.FamilyTree, d);
-
-            repository.UpdateNow(d);
+            var helper = new FamilyTreePermissionHelper(service);
 
             var currentPerson = data.CurrentPerson != null ? data.CurrentPerson.FamilyPerson.PersonId : null;
             if (string.IsNullOrEmpty(currentPerson)) currentPerson = d.AncestorPersonId;
 
+            // 谱级口径：管理员才能改谱字段（名/简介/公开开关/挂始祖）；
+            // 成员只准维护以自己当前族员为锚点的家支关系（锚点上溯两代内可能含始祖，HasPermission(始祖) 做不了谱级闸）
+            var isManager = helper.IsManager(d.TreeId);
+            if (!isManager)
+            {
+                if (!helper.HasPermission(d.TreeId, currentPerson))
+                {
+                    throw new ValidatedException("您没有修改权限.");
+                }
+                if (!string.IsNullOrEmpty(data.FamilyTree.AncestorPersonId) && data.FamilyTree.AncestorPersonId != d.AncestorPersonId)
+                {
+                    throw new ValidatedException("您没有挂始祖权限.");
+                }
+            }
+
+            if (isManager)
+            {
+                ObjectCopyHelper.Copy(data.FamilyTree, d);
+
+                repository.UpdateNow(d);
+            }
+
             if (data.CurrentPerson != null && data.CurrentPerson.FamilyTreeSpouseMaps != null && data.CurrentPerson.FamilyTreeSpouseMaps.Length > 0)
                 data.CurrentPerson.FamilyTreeSpouseMaps.ToLookup(x => x.TreeId = d.TreeId);
 
             if (data.CurrentPerson != null && data.CurrentPerson.FamilyTreeChildrenMaps != null && data.CurrentPerson.FamilyTreeChildrenMaps.Length > 0)
                 data.CurrentPerson.FamilyTreeChildrenMaps.ToLookup(x => x.TreeId = d.TreeId);
 
-            SaveSpouseMaps(data.CurrentPerson.FamilyPerson.PersonId, data.CurrentPerson.FamilyTreeSpouseMaps);
+            SaveSpouseMaps(d.TreeId, data.CurrentPerson.FamilyPerson.PersonId, data.CurrentPerson.FamilyTreeSpouseMaps);
             //SaveParentMaps(data.CurrentPerson.FamilyPerson.PersonId, data.CurrentPerson.FamilyTreeParentMaps);
-            SaveSonMaps(data.CurrentPerson.FamilyPerson.PersonId, data.CurrentPerson.FamilyTreeChildrenMaps);
+            SaveSonMaps(d.TreeId, data.CurrentPerson.FamilyPerson.PersonId, data.CurrentPerson.FamilyTreeChildrenMaps);
 
             return FindByCurrentPerson(data.FamilyTree.TreeId, currentPerson);
         }
@@ -525,9 +657,8 @@ namespace CloudBuilder.Master.Service
             var ent = repository.DetachedEntities.Where(x => x.TreeId == key).FirstOrDefault()!;
             if (ent == null) return;
 
-            var has = new FamilyTreePermissionHelper(service).HasPermission(ent.TreeId, ent.AncestorPersonId);
-
-            if(!has)
+            // 删谱属谱级操作，仅管理员：成员锚点若贴近始祖，HasPermission 也会为真，不能做闸
+            if (!new FamilyTreePermissionHelper(service).IsManager(ent.TreeId))
             {
                 throw new ValidatedException("您没有删除权限.");
             }

CloudBuilder/CloudBuilder.Master.Service/FamilyTreeUtility/FamilyTreePermissionHelper.cs

@@ -29,6 +29,49 @@ namespace CloudBuilder.Master.Service.FamilyTreeUtility
             return GetPersonId(permissions, treeId).Where(x => x == personId).Any();
         }
 
+        /// <summary>
+        /// 管理员口径：该谱系下此用户存在 ManagerIndc=Y 且已生效的权限行（谱级操作专属）。
+        /// 注意与 HasPermission 区分：成员若绑始祖或始祖在其上溯两代内，HasPermission(始祖) 也会为真，
+        /// 不能拿它当谱级闸，否则这些成员能改谱/删谱
+        /// </summary>
+        public bool IsManager(string treeId)
+        {
+            IRepository<FamilyTreePermissionEntity> repositoryPermission = service.GetRepository<IRepository<FamilyTreePermissionEntity>>();
+
+            return repositoryPermission.DetachedEntities
+                .Where(x => x.UserName == service.UserId
+                    && x.TreeId == treeId
+                    && x.ManagerIndc == YesNoPolicy.YES
+                    && x.ValidIndc == YesNoPolicy.YES)
+                .Any();
+        }
+
+        /// <summary>
+        /// 成员口径：该谱系下此用户存在已生效权限行（不分管理员/成员档），
+        /// 供「往谱里新增人」这类无既有 PersonId 可校验的操作做最小闸门
+        /// </summary>
+        public bool IsMember(string treeId)
+        {
+            IRepository<FamilyTreePermissionEntity> repositoryPermission = service.GetRepository<IRepository<FamilyTreePermissionEntity>>();
+
+            return repositoryPermission.DetachedEntities
+                .Where(x => x.UserName == service.UserId
+                    && x.TreeId == treeId
+                    && x.ValidIndc == YesNoPolicy.YES)
+                .Any();
+        }
+
+        /// <summary>
+        /// 当前用户在本谱可编的族员集合（家支主线，口径与 HasPermission 完全同源）；
+        /// 供详情接口下发给前端做「逐个目标人」的编辑/删除钮判定（锚点级 IsCanAmend 盖不住关系行里的旁支）
+        /// </summary>
+        public List<string> GetAmendablePersonIds(string treeId)
+        {
+            IRepository<FamilyTreePermissionEntity> repositoryPermission = service.GetRepository<IRepository<FamilyTreePermissionEntity>>();
+            FamilyTreePermissionEntity[] permissions = repositoryPermission.DetachedEntities.Where(x => x.TreeId == treeId && x.UserName == service.UserId && x.ValidIndc == YesNoPolicy.YES).ToArray();
+            return GetPersonId(permissions, treeId);
+        }
+
         public List<string> GetPersonId(FamilyTreePermissionEntity[] permissions, string treeId)
         {
             List<string> ps = new List<string>();
@@ -41,7 +84,7 @@ namespace CloudBuilder.Master.Service.FamilyTreeUtility
 
             IRepository<FamilyTreeSpouseMapEntity> repositorySpouseMap = service.GetRepository<IRepository<FamilyTreeSpouseMapEntity>>();
 
-            if (childrens == null || childrens.Length == 0)
+            if (spouses == null || spouses.Length == 0)
                 spouses = repositorySpouseMap.DetachedEntities.Where(x => x.TreeId == treeId).ToArray();
 
             foreach (var permission in permissions)
@@ -63,12 +106,16 @@ namespace CloudBuilder.Master.Service.FamilyTreeUtility
                 foreach (FamilyTreeChildrenMapEntity child in childrens.Where(x => x.PersonId == personId))
                     PackPersonIdByChildrenMaps(childrens, spouses, child.ChildrenId, ps);
             }
-            //父亲ID也有权限
-            if (childrens != null && childrens.Where(x => x.ChildrenId == personId).Any())
+            //向上延伸：最多两代（父、祖），含每一代配偶（家支口径；不含兄弟姐妹等旁支）
+            string cursor = personId;
+            for (int up = 0; up < 2 && childrens != null; up++)
             {
-                var p = childrens.Where(x => x.ChildrenId == personId).Select(x => x.PersonId).FirstOrDefault();
-                if (!ps.Contains(p))
-                    ps.Add(p);
+                string father = childrens.Where(x => x.ChildrenId == cursor).Select(x => x.PersonId).FirstOrDefault();
+                // ps 去重兼做环保护：父链成环或已收过即停
+                if (string.IsNullOrEmpty(father) || ps.Contains(father)) break;
+                ps.Add(father);
+                PackPersonIdBySpouseMaps(spouses, father, ps);
+                cursor = father;
             }
             //配偶都有权限
             PackPersonIdBySpouseMaps(spouses, personId, ps);