From 6e9871b09928d088f8786fa06da75bed8c5374b8 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 1 Apr 2022 15:00:18 +0800
Subject: [PATCH] =?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/Common/CommonDocumentService.cs               | 7 ++++++-
 .../Service/Common/DTO/CommonDocumentViewModel.cs         | 4 ++--
 IRaCIS.Core.Domain/Common/CommonDocument.cs               | 8 +++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs b/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs
index 5b4a9ccf8..947957c6d 100644
--- a/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs
+++ b/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs
@@ -28,7 +28,12 @@ namespace IRaCIS.Core.Application.Service
         public async Task<List<CommonDocumentView>> GetCommonDocumentList(CommonDocumentQuery queryCommonDocument)
         {
 
-            var commonDocumentQueryable = _commonDocumentRepository.ProjectTo<CommonDocumentView>(_mapper.ConfigurationProvider);
+            var commonDocumentQueryable = _commonDocumentRepository.AsQueryable(true)
+                .WhereIf( queryCommonDocument.ModuleTypeId!=null ,t=>t.ModuleTypeId == queryCommonDocument.ModuleTypeId)
+                .WhereIf(queryCommonDocument.FileTypeId != null, t => t.FileTypeId == queryCommonDocument.FileTypeId)
+                .WhereIf( string.IsNullOrEmpty(queryCommonDocument.Code) , t => t.Code.Contains(queryCommonDocument.Code) )
+                .WhereIf(string.IsNullOrEmpty(queryCommonDocument.Name), t => t.Name.Contains(queryCommonDocument.Name))
+                .ProjectTo<CommonDocumentView>(_mapper.ConfigurationProvider);
 
             return await commonDocumentQueryable.ToListAsync();
         }
diff --git a/IRaCIS.Core.Application/Service/Common/DTO/CommonDocumentViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/CommonDocumentViewModel.cs
index 64607e7e4..38f4ee9be 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/CommonDocumentViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/CommonDocumentViewModel.cs
@@ -26,7 +26,7 @@ namespace IRaCIS.Core.Application.ViewModel
     public class CommonDocumentQuery
     {
         public Guid? FileTypeId { get; set; }
-        public Guid? ModuleId { get; set; }
+        public Guid? ModuleTypeId { get; set; }
         public string Name { get; set; } = String.Empty;
 
         public string Code { get; set; } = String.Empty;
@@ -43,7 +43,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public bool IsDeleted { get; set; }
         public string Code { get; set; } = String.Empty;
         public Guid FileTypeId { get; set; }
-        public Guid ModuleId { get; set; }
+        public Guid ModuleTypeId { get; set; }
     }
 
 
diff --git a/IRaCIS.Core.Domain/Common/CommonDocument.cs b/IRaCIS.Core.Domain/Common/CommonDocument.cs
index 2f252ff1c..8bb6871e2 100644
--- a/IRaCIS.Core.Domain/Common/CommonDocument.cs
+++ b/IRaCIS.Core.Domain/Common/CommonDocument.cs
@@ -80,11 +80,9 @@ namespace IRaCIS.Core.Domain.Models
 		[Required]
 		public Guid FileTypeId { get; set; }
 	
-		/// <summary>
-        /// ModuleId
-        /// </summary>
-		[Required]
-		public Guid ModuleId { get; set; }
+
+		
+		public Guid ModuleTypeId { get; set; }
 
 
 		public Dictionary FileType { get; set; }