From 0b47d6ca0959a457d652488ec1dd6b20f995798b Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 10 Apr 2025 10:32:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.xml | 8 +++++ .../Service/Document/AuditDocumentService.cs | 34 +++++++++++++++---- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 41ddec493..43ac7613a 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1409,6 +1409,14 @@ + + + 新增文件夹 + + + + + 新增稽查文档 diff --git a/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs b/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs index 405ebfce5..a17b742e6 100644 --- a/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs @@ -62,12 +62,34 @@ public class AuditDocumentService(IRepository _auditDocumentRepos return ResponseOutput.Ok(result.Id); } - /// - /// 新增稽查文档 - /// - /// - /// - [HttpPost] + /// + /// 新增文件夹 + /// + /// + /// + /// + [HttpPost] + public async Task AddFolder(AuditDocumentAddOrEdit inDto) + { + + if (await _auditDocumentRepository.AnyAsync(x => x.Name == inDto.Name && x.AuditDocumentTypeEnum == inDto.AuditDocumentTypeEnum && x.ParentId == inDto.ParentId)) + { + throw new BusinessValidationFailedException(_localizer["AuditDocument_CanNotAddFolder"]); + } + + List auditDocumentAddOrEdits = new List(); + + auditDocumentAddOrEdits.Add(inDto); + var result= await AddAuditDocument(auditDocumentAddOrEdits); + return ResponseOutput.Ok(result); + } + + /// + /// 新增稽查文档 + /// + /// + /// + [HttpPost] public async Task AddAuditDocument(List inDto) { List resultData = new List(); From cc135449686b5a3fd3a46f2ba4656d62e11e4c12 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 10 Apr 2025 10:40:05 +0800 Subject: [PATCH 2/4] =?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 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs b/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs index a17b742e6..42723632e 100644 --- a/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs @@ -418,7 +418,10 @@ public class AuditDocumentService(IRepository _auditDocumentRepos })).CurrentPageData; List auditDocumentAddOrEdits = _mapper.Map>(data); - auditDocumentAddOrEdits.ForEach(x => x.IsUpdate = false); + auditDocumentAddOrEdits.ForEach(x => { + x.IsUpdate = false; + x.Id = null; + }); await addData(auditDocumentAddOrEdits); } @@ -432,7 +435,7 @@ public class AuditDocumentService(IRepository _auditDocumentRepos item.Children.ForEach(x => { x.ParentId = result.Id; x.IsUpdate = false; - + x.Id = null; }); if (item.Children.Count() > 0) From a35fe11f5b3dacb64f3819f900f1641547cf2970 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 10 Apr 2025 11:14:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs b/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs index 42723632e..efed114e2 100644 --- a/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs @@ -421,6 +421,7 @@ public class AuditDocumentService(IRepository _auditDocumentRepos auditDocumentAddOrEdits.ForEach(x => { x.IsUpdate = false; x.Id = null; + x.ParentId = inDto.ParentId; }); await addData(auditDocumentAddOrEdits); } From 06cee8926e150a9de914b4db5494259744a1ebc5 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 10 Apr 2025 11:18:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Management/UserService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index 67b7efc07..355a0b673 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -863,8 +863,8 @@ namespace IRaCIS.Core.Application.Service .WhereIf(inQuery.OptTypeList != null && inQuery.OptTypeList.Count > 0, t => inQuery.OptTypeList.Contains(t.OptType)) .WhereIf(inQuery.BeginDate != null, t => t.CreateTime >= inQuery.BeginDate) .WhereIf(inQuery.EndDate != null, t => t.CreateTime <= inQuery.EndDate) - .WhereIf(inQuery.IsLoginUncommonly != null && inQuery.IsLoginUncommonly.Value, t => t.IsLoginUncommonly&&!t.IsIgnoreUncommonly) - .WhereIf(inQuery.IsLoginUncommonly != null && !inQuery.IsLoginUncommonly.Value, t => !t.IsLoginUncommonly || t.IsIgnoreUncommonly) + .WhereIf(inQuery.IsLoginUncommonly != null , t => t.IsLoginUncommonly== inQuery.IsLoginUncommonly) + .WhereIf(!string.IsNullOrEmpty(inQuery.LoginUserName), t => t.ActionUserName.Contains(inQuery.LoginUserName!)) .WhereIf(!string.IsNullOrEmpty(inQuery.LoginFaildName), t => t.ActionUserName.Contains(inQuery.LoginFaildName!)) .WhereIf(!string.IsNullOrEmpty(inQuery.IP), t => t.IP.Contains(inQuery.IP!))