From 31b11bdcd34469bce82d79554fad86f113ed86d9 Mon Sep 17 00:00:00 2001 From: cheche <717840555@qq.com> Date: Mon, 11 Mar 2024 18:19:28 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=B6=88=E8=B4=B9=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs | 2 +- Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs index 2da9af54..a456f22a 100644 --- a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs @@ -23,7 +23,7 @@ public class BalanceRecordPageRequest : PageDto, IValidatableObject /// 充值/消费 /// [EnumDataType(typeof(BalanceRecordTypeEnumType))] - public BalanceRecordTypeEnumType Type { get; set; } + public BalanceRecordTypeEnumType? Type { get; set; } /// diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index d4cbeed2..49d202aa 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -46,7 +46,7 @@ public class BalanceService : IBalanceService .WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, record => record.CostDate <= request.SearchDateTimePeriod.End) .WhereIF(request.BusinessplaceCodes.IsPresent(), record => request.BusinessplaceCodes.Contains(record.BusinessPlaceCode)) .WhereIF(request.ShiftTypes.IsPresent(), record => request.ShiftTypes.Contains(record.ShiftType)) - .WhereIF(request.Type.ToString().IsPresent(),record => record.Type == request.Type) + .WhereIF(request.Type.HasValue,record => record.Type == request.Type) .WhereIF(request.Search.IsPresent(), (record, ga) => ga.Name.Contains(request.Search) || ga.Code.Contains(request.Search)