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)