From 49993edb37aebf3105e4fd9c6f5b571fe4789a1d Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 27 Jun 2024 15:38:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Common/DTO/InternationalizationViewModel.cs       | 4 ++++
 .../Service/Common/InternationalizationService.cs             | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs
index 2ad2de83c..eb64a391e 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs
@@ -33,6 +33,10 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public string? ValueCN { get; set; }
 
+        public string? Module { get; set; } 
+        //关联版本历史记录表Id
+        public Guid? PublishLogId { get; set; }
+
     }
 
     ///<summary> InternationalizationAddOrEdit  列表查询参数模型</summary>
diff --git a/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs b/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs
index f3c18f9d3..5f0743d27 100644
--- a/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs
+++ b/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs
@@ -100,6 +100,8 @@ namespace IRaCIS.Core.Application.Service
 
             var internationalizationQueryable = _internationalizationRepository
                 .WhereIf(inQuery.Description != null, t => t.Description.Contains(inQuery.Description))
+                 .WhereIf(inQuery.Module != null, t => t.Description.Contains(inQuery.Module))
+                 .WhereIf(inQuery.PublishLogId != null, t => t.PublishLogId==inQuery.PublishLogId)
                 .WhereIf(inQuery.Code != null, t => t.Code.Contains(inQuery.Code))
                 .WhereIf(inQuery.State != null, t => t.State == inQuery.State)
                 .WhereIf(inQuery.InternationalizationType != null, t => t.InternationalizationType == inQuery.InternationalizationType)