diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs index 1900f3e3..6f888eeb 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs @@ -179,6 +179,7 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService .LeftJoin((x, ga, dept) => dept.No == ga.DepartmentNo) .Where(x => myCodes.Contains(x.BusinessPlaceCode)) .WhereIF(request.OrderStatus.HasValue, x => x.OrderStatus == request.OrderStatus) + .WhereIF(request.Source.HasValue, x => x.Source == request.Source) .WhereIF(request.Search.IsPresent(), (x, ga) => x.UserCode == request.Search || ga.Name.Contains(request.Search)) .WhereIF(request.BookingPeriod?.Start.HasValue == true && request.BookingPeriod?.End.HasValue == true, x => SqlFunc.Subqueryable() @@ -213,7 +214,7 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService page.Data.ForEach(x => { x.BookingDate = details.FirstOrDefault(item => item.OrderNo == x.No).BookingDate; - x.TotalNumber = details.Sum(item => item.Number); + x.TotalNumber = details.Where(item => item.OrderNo == x.No).Sum(item => item.Number); }); return page;