diff --git a/Src/Dlhis.Basic/BusinessShift/Request/BusinessPlaceShiftPageRequest.cs b/Src/Dlhis.Basic/BusinessShift/Request/BusinessPlaceShiftPageRequest.cs index f7789f2b..ed518c13 100644 --- a/Src/Dlhis.Basic/BusinessShift/Request/BusinessPlaceShiftPageRequest.cs +++ b/Src/Dlhis.Basic/BusinessShift/Request/BusinessPlaceShiftPageRequest.cs @@ -4,4 +4,5 @@ namespace Dlhis.Basic.BusinessShift.Request; public class BusinessPlaceShiftPageRequest : PageDto { + public Guid? BusinessPlaceCode { get; set; } } diff --git a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs index 3f270c33..a1993c14 100644 --- a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs +++ b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs @@ -25,6 +25,7 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService var page = await _dbContext.Queryable() .LeftJoin((shift, place) => shift.BusinessPlaceCode == place.Code) .WhereIF(request.Search.IsPresent(), (shift, place) => shift.CustomCode.Contains(request.Search) || shift.Name.Contains(request.Search)) + .WhereIF(request.BusinessPlaceCode.HasValue, (shift, place) => shift.BusinessPlaceCode == request.BusinessPlaceCode) .Select((shift, place) => new BusinessPlaceShiftResponse { Id = shift.Id,