From dcc1f192190b7fb7c5494632fd6784ee60514572 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 5 Jan 2024 10:51:54 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E9=A4=90=E6=AC=A1=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessShift/Request/BusinessPlaceShiftPageRequest.cs | 1 + .../Services/Implements/BusinessPlaceShiftService.cs | 1 + 2 files changed, 2 insertions(+) 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,