From b79b4567b4364bd9933fd73947373918eede8d78 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 7 Apr 2025 17:42:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A8=BD=E6=9F=A5=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Document/AuditDocumentService.cs          | 11 +++++++----
 .../Service/Document/DTO/AuditDocumentViewModel.cs    |  3 +++
 .../Service/Document/_MapConfig.cs                    |  1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs b/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs
index 266f49ba6..405ebfce5 100644
--- a/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs
+++ b/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs
@@ -211,8 +211,9 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
 
 
 		var query = data
-			.WhereIf(inDto.Id != null, x => inDto.Id == x.ParentId)
-			.WhereIf(inDto.Id == null, x => x.ParentId == null);
+            .WhereIf(inDto.SelfId != null, x => inDto.SelfId == x.Id)
+            .WhereIf(inDto.Id != null, x => inDto.Id == x.ParentId)
+			.WhereIf(inDto.Id == null&& inDto.SelfId == null, x => x.ParentId == null);
 
 
 
@@ -388,12 +389,13 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
 		{
           var data =  (await GetAuditDocumentData(new GetAuditDocumentDataInDto()
             {
-                Id =item,
+                SelfId =item,
+                
 				PageIndex=1,
 				PageSize= 1000
             })).CurrentPageData;
 
-            List<AuditDocumentAddOrEdit> auditDocumentAddOrEdits = _mapper.Map<List<AuditDocumentAddOrEdit>>(inDto);
+            List<AuditDocumentAddOrEdit> auditDocumentAddOrEdits = _mapper.Map<List<AuditDocumentAddOrEdit>>(data);
             auditDocumentAddOrEdits.ForEach(x => x.IsUpdate = false);
             await addData(auditDocumentAddOrEdits);
         }
@@ -402,6 +404,7 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
         {
             foreach (var item in data)
             {
+                item.Id = null;
                 var result = await AddOrUpdateAuditDocument(item);
 
                 item.Children.ForEach(x => {
diff --git a/IRaCIS.Core.Application/Service/Document/DTO/AuditDocumentViewModel.cs b/IRaCIS.Core.Application/Service/Document/DTO/AuditDocumentViewModel.cs
index 8001d94a5..ab2192b00 100644
--- a/IRaCIS.Core.Application/Service/Document/DTO/AuditDocumentViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Document/DTO/AuditDocumentViewModel.cs
@@ -28,6 +28,9 @@ public class GetAuditDocumentDataInDto:PageInput
 {
     public  Guid? Id { get; set; }
 
+    public Guid? SelfId { get; set; }
+
+
     public bool? IsAuthorization { get; set; }
 
     public string Name { get; set; } = string.Empty;
diff --git a/IRaCIS.Core.Application/Service/Document/_MapConfig.cs b/IRaCIS.Core.Application/Service/Document/_MapConfig.cs
index d68f6a68a..be42efb19 100644
--- a/IRaCIS.Core.Application/Service/Document/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Document/_MapConfig.cs
@@ -15,6 +15,7 @@ namespace IRaCIS.Core.Application.Service
             var userId = Guid.Empty;
             var isEn_Us = false;
             CreateMap<AuditDocumentData, AuditDocumentAddOrEdit>();
+            //CreateMap<List<AuditDocumentData>, List<AuditDocumentAddOrEdit>>();
             CreateMap<AuditDocument, AuditDocumentView>();
             CreateMap<AuditDocument, AuditDocumentUpdateDto>();
             CreateMap<AuditDocument, HistoricalVersionDto>();