From c867dd2533e930038016a16bd362652849adbb2e Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Wed, 10 Apr 2024 15:20:22 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/MealSupplementsRecordController.cs     |  1 +
 .../Request/MealSupplementRecordRequest.cs            | 11 +++++++++++
 .../Implements/MealSupplementRecordService.cs         |  2 ++
 3 files changed, 14 insertions(+)

diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Controller/MealSupplementsRecordController.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Controller/MealSupplementsRecordController.cs
index 2644e477..173cff3b 100644
--- a/Src/Dlhis.Canteen/MealSupplementRecord/Controller/MealSupplementsRecordController.cs
+++ b/Src/Dlhis.Canteen/MealSupplementRecord/Controller/MealSupplementsRecordController.cs
@@ -27,6 +27,7 @@ public class MealSupplementsRecordController
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
+    [Authorize(Roles = "admin,tenant-admin")]
     [HttpGet("page")]
     public async Task<Pagination<MealSupplementRecordResponse>> MealSupplementRecordPageAsync([FromQuery] MealSupplementRecordRequest request)
     {
diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Request/MealSupplementRecordRequest.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Request/MealSupplementRecordRequest.cs
index c93f2bb1..53df63c5 100644
--- a/Src/Dlhis.Canteen/MealSupplementRecord/Request/MealSupplementRecordRequest.cs
+++ b/Src/Dlhis.Canteen/MealSupplementRecord/Request/MealSupplementRecordRequest.cs
@@ -18,6 +18,17 @@ public class MealSupplementRecordRequest : PageDto, IValidatableObject
     /// </summary>
     public bool? Sync { get; set; }
 
+    /// <summary>
+    /// 工作地
+    /// </summary>
+    public string Workplace { get; set; }
+
+    /// <summary>
+    /// 厂区
+    /// </summary>
+    public string Factory { get; set; }
+
+
     /// <summary>
     /// 餐补日期范围
     /// </summary>
diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs
index 121d47e3..1cb3ec82 100644
--- a/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs
+++ b/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs
@@ -33,6 +33,8 @@ public class MealSupplementRecordService : IMealSupplementRecordService
             .LeftJoin<GainfoEntity>((x, ga) => x.Code == ga.Code)
             .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.DateTimePeriod?.Start.HasValue == true
                     && request.DateTimePeriod?.End.HasValue == true,
                     x => x.Date >= request.DateTimePeriod.Start && x.Date <= request.DateTimePeriod.End)