ow

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

@@ -234,6 +234,12 @@ namespace CloudBuilder.Master.Service
                 sqlWhere = SearchFilter.ComposeWhereClause(criteria.Filter);
             }
 
+            // 数据级可见闸（口径同 FamilyGroupService）：公开谱人人可见，私密谱仅持有生效权限行的管理员/成员可见；
+            // 视图无 valid_indc 列，有效性由权限行 valid_indc='Y' 侧保证
+            sqlWhere += $" and ( {FamilyTreeViewEntity.DB_PUBLIC_INDC}='{YesNoPolicy.YES}' or {FamilyTreeViewEntity.DB_TREE_ID} in (" +
+                $"select {FamilyTreePermissionEntity.DB_TREE_ID} from {FamilyTreePermissionEntity.DB_NAME_FAMILY_TREE_PERMISSION}" +
+                $" where {FamilyTreePermissionEntity.DB_USER_NAME}='{service.UserId}' and {FamilyTreePermissionEntity.DB_VALID_INDC}='{YesNoPolicy.YES}'))";
+
             FamilyTreeViewEntity entity = FamilyTreeViewEntity.GetInstance(repository.GetDbContext().Database.ProviderName);
             string sql = entity.GetSelectTopFrom(criteria.limit, criteria.page, criteria.orderby.StringToDbField(), criteria.orderbytag, sqlWhere);