From e9975af591783f9dea0b75402a656c8588edd249 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Mon, 8 Jun 2026 09:42:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=91=BD=E4=B8=AD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/MealSupplementRecordService.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs index 93b7c31b..ec878903 100644 --- a/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs +++ b/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs @@ -85,14 +85,16 @@ public class MealSupplementRecordService : IMealSupplementRecordService return _dbContext.Queryable() .LeftJoin((x, ga) => x.Code == ga.Code) .LeftJoin((x, ga, gaLeave) => gaLeave.Code == x.Code) + .WhereIF(request.Search.IsPresent(), (x, ga) => x.Code == request.Search) + .WhereIF(request.DateTimePeriod.HasValue(), x => x.Date >= request.DateTimePeriod.Start && x.Date <= request.DateTimePeriod.End) .WhereIF(request.Status.HasValue, x => x.Status == request.Status) .WhereIF(request.Sync.HasValue, x => x.Sync == request.Sync) .WhereIF(request.Workplace.IsPresent(), x => x.Workplace == request.Workplace) .WhereIF(request.Factory.IsPresent(), x => x.Factory == request.Factory) .WhereIF(request.DepartmentNo.IsPresent(), (x, ga, gaLeave) => ga.DepartmentNo == request.DepartmentNo || gaLeave.DepartmentNo == request.DepartmentNo) .WhereIF(request.Werks.IsPresent(), (x, ga) => ga.Werks == request.Werks) - .WhereIF(request.DateTimePeriod.HasValue(), x => x.Date >= request.DateTimePeriod.Start && x.Date <= request.DateTimePeriod.End) - .WhereIF(request.Search.IsPresent(), (x, ga) => x.Code == request.Search || ga.Name == request.Search); + .OrderByDescending(x => x.Date) + ; } }