diff --git a/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs index 9b51e5030..2425ca8e9 100644 --- a/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs +++ b/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs @@ -23,7 +23,7 @@ namespace IRaCIS.Core.Application.ViewModel public class InternationalizationQuery : PageInput { - public string? FolderPath { get; set; } + public string? Description { get; set; } public string? Code { get; set; } public string? Value { get; set; } @@ -36,7 +36,7 @@ namespace IRaCIS.Core.Application.ViewModel { public Guid? Id { get; set; } public int State { get; set; } - public string FolderPath { get; set; } + public string Description { get; set; } public string Code { get; set; } public string Value { get; set; } public string ValueCN { get; set; } diff --git a/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs b/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs index 7c578c36e..a110049bb 100644 --- a/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs +++ b/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs @@ -29,10 +29,10 @@ namespace IRaCIS.Core.Application.Service { var internationalizationQueryable =_internationalizationRepository - .WhereIf(inQuery.FolderPath!=null,t=>t.FolderPath.Contains(inQuery.FolderPath)) - .WhereIf(inQuery.Code != null, t => t.FolderPath.Contains(inQuery.Code)) - .WhereIf(inQuery.Value != null, t => t.FolderPath.Contains(inQuery.Value)) - .WhereIf(inQuery.ValueCN != null, t => t.FolderPath.Contains(inQuery.ValueCN)) + .WhereIf(inQuery.Description!=null,t=>t.Description.Contains(inQuery.Description)) + .WhereIf(inQuery.Code != null, t => t.Code.Contains(inQuery.Code)) + .WhereIf(inQuery.Value != null, t => t.Value.Contains(inQuery.Value)) + .WhereIf(inQuery.ValueCN != null, t => t.ValueCN.Contains(inQuery.ValueCN)) .ProjectTo(_mapper.ConfigurationProvider); var pageList = await internationalizationQueryable diff --git a/IRaCIS.Core.Domain/Common/Internationalization.cs b/IRaCIS.Core.Domain/Common/Internationalization.cs index bd6311a9d..dc3292224 100644 --- a/IRaCIS.Core.Domain/Common/Internationalization.cs +++ b/IRaCIS.Core.Domain/Common/Internationalization.cs @@ -33,7 +33,7 @@ namespace IRaCIS.Core.Domain.Models public int State { get; set; } - public string FolderPath { get; set; } + public string Description { get; set; } public string Code { get; set; }