From a713ffdc61798059d6121df7d62a6273a517dd6b Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 29 Sep 2025 10:21:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E6=96=87=E4=BB=B6=E5=A4=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Document/AuditDocumentService.cs | 33 ------------------- IRaCIS.Core.Domain/Document/AuditDocument.cs | 6 ++++ 2 files changed, 6 insertions(+), 33 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs b/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs index 2ed2fdb03..5a889bac6 100644 --- a/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs @@ -588,39 +588,6 @@ public class AuditDocumentService(IRepository _auditDocumentRepos throw new BusinessValidationFailedException(_localizer["AuditDocument_CanNotMove"]); } - foreach (var id in inDto.Ids) - { - var node = await _auditDocumentRepository.FirstOrDefaultAsync(t => t.Id == id); - - //找到设置父节点的儿子节点 - var existSameName = await _auditDocumentClosureRepository - .Where(t => t.AncestorId == inDto.ParentId && t.Depth == 1) - .Select(t => t.Descendant).AnyAsync(t => t.Name == node.Name && t.AuditDocumentTypeEnum == node.AuditDocumentTypeEnum); - - //不存在同名节点,那么直接移动 - if (!existSameName) - { - //移动ParentId - - - node.ParentId = inDto.ParentId; - - await _auditDocumentRepository.SaveChangesAsync(); - - - // 删除原有闭包关系 - await _auditDocumentClosureRepository.BatchDeleteNoTrackingAsync(t => matchIdQuery.Contains(t.DescendantId) || matchIdQuery.Contains(t.AncestorId)); - - - //建立新的节点的闭包关系 - await AddClosureRelationsAsync(node.Id, inDto.ParentId); - - //建立新的节点后的子孙后代闭包关系 不包括自己 - - //var chai _auditDocumentClosureRepository.Where(t => t.AncestorId == id && t.Depth > 0).OrderBy(t => t.Depth).Select(t => t.DescendantId); - - } - } return ResponseOutput.Ok(); } diff --git a/IRaCIS.Core.Domain/Document/AuditDocument.cs b/IRaCIS.Core.Domain/Document/AuditDocument.cs index 4abcc87ce..73ea586da 100644 --- a/IRaCIS.Core.Domain/Document/AuditDocument.cs +++ b/IRaCIS.Core.Domain/Document/AuditDocument.cs @@ -106,9 +106,15 @@ namespace IRaCIS.Core.Domain.Models public AuditDocument Descendant { get; set; } + /// + /// 父Id + /// [Comment("祖先")] public Guid AncestorId { get; set; } + /// + /// 子Id + /// [Comment("后代")] public Guid DescendantId { get; set; } public int Depth { get; set; } // 0=自己, 1=直接子节点, 2=孙节点...