From 21af8b809302c5e5115d6a50bc02713ef40b348d Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Fri, 1 Apr 2022 17:32:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Common/DTO/FrontAuditConfigViewModel.cs | 4 ++++ .../Service/Common/FrontAuditConfigService.cs | 12 +++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs index 722135d2..430e4c60 100644 --- a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs +++ b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs @@ -83,6 +83,10 @@ namespace IRaCIS.Core.Application.ViewModel /// ChildrenTypeId public string ChildrenTypeId { get; set; } = string.Empty; + public string ModuleTypeId { get; set; } = string.Empty + + public string ObjectTypeId { get; set; } = string.Empty; + } /// FrontAuditConfigAddOrEdit 列表查询参数模型 diff --git a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs index 9621748f..f2ba90a1 100644 --- a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs @@ -84,11 +84,13 @@ namespace IRaCIS.Core.Application.Service query = query .WhereIf(!iq.Value.IsNullOrEmpty(), x => x.Value == iq.Value) - .WhereIf(!iq.Value.IsNullOrEmpty(), x => x.ValueCN == iq.ValueCN) - .WhereIf(!iq.Value.IsNullOrEmpty(), x => x.Description == iq.Description) - .WhereIf(!iq.Value.IsNullOrEmpty(), x => x.OptTypeId == iq.OptTypeId) - .WhereIf(!iq.Value.IsNullOrEmpty(), x => x.Code == iq.Code) - .WhereIf(!iq.Value.IsNullOrEmpty(), x => x.ChildrenTypeId == iq.ChildrenTypeId); + .WhereIf(!iq.ValueCN.IsNullOrEmpty(), x => x.ValueCN == iq.ValueCN) + .WhereIf(!iq.Description.IsNullOrEmpty(), x => x.Description == iq.Description) + .WhereIf(!iq.OptTypeId.IsNullOrEmpty(), x => x.OptTypeId == iq.OptTypeId) + .WhereIf(!iq.Code.IsNullOrEmpty(), x => x.Code == iq.Code) + .WhereIf(!iq.ChildrenTypeId.IsNullOrEmpty(), x => x.ChildrenTypeId == iq.ChildrenTypeId) + .WhereIf(!iq.ModuleTypeId.IsNullOrEmpty(), x => x.ModuleTypeId == iq.ModuleTypeId) + .WhereIf(!iq.ObjectTypeId.IsNullOrEmpty(), x => x.ObjectTypeId == iq.ObjectTypeId); return await query.OrderBy(x=>x.Sort).ToListAsync(); }