From 54ed9e59335c9df9b238319eb36865380f21bc3d Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Wed, 17 Dec 2025 11:06:18 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=88=B8=E5=8F=91=E6=94=BE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=A2=9E=E5=8A=A0=E5=8E=82=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Order/Services/Implements/BookingOrderService.cs       | 7 ++++---
 .../Setting/Services/Implements/WalletService.cs           | 5 ++++-
 .../Voucher/Controllers/VouchersController.cs              | 3 +--
 Src/Dlhis.Canteen/Voucher/Requests/VoucherPageRequest.cs   | 5 +++++
 .../Voucher/Services/Implements/BaseVoucherService.cs      | 5 +++--
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs
index d668ad76..3a15eba7 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs
@@ -173,6 +173,7 @@ public class BookingOrderService : IBookingOrderService
                     .Where(p => p.OrderNo == x.No)
                     .Where(p => p.BookingDate >= request.BookingPeriod.Start)
                     .Where(p => p.BookingDate <= request.BookingPeriod.End)
+                    .Where(p => p.IsDeleted == false)
                     .Any()
             )
             .WhereIF(request.ShiftType.HasValue, x => x.ShiftType == request.ShiftType)
@@ -203,9 +204,9 @@ public class BookingOrderService : IBookingOrderService
             x.BookingDate = details.First(item => item.OrderNo == x.No).BookingDate;
             x.TotalNumber = details.Where(item => item.OrderNo == x.No).Sum(item => item.Number);
             x.DishesInfos = details.Where(item => item.OrderNo == x.No).Select(item => new
-                {
-                    item.Name
-                })
+            {
+                item.Name
+            })
                 .ToList();
         });
 
diff --git a/Src/Dlhis.Canteen/Setting/Services/Implements/WalletService.cs b/Src/Dlhis.Canteen/Setting/Services/Implements/WalletService.cs
index ffe3dd45..57f83f6a 100644
--- a/Src/Dlhis.Canteen/Setting/Services/Implements/WalletService.cs
+++ b/Src/Dlhis.Canteen/Setting/Services/Implements/WalletService.cs
@@ -30,7 +30,10 @@ public class WalletService : IWalletService
             {
                 Code = x.Code,
                 Name = x.Name + "钱包",
-                Factories = SqlFunc.Subqueryable<WalletEntity>().Where(p => p.Code == x.Code).ToList(p => p.Factory)
+                Factories = SqlFunc.Subqueryable<WalletEntity>()
+                                    .Where(p => p.Code == x.Code)
+                                    .Where(p => p.IsDeleted == false)
+                                    .ToList(p => p.Factory)
             })
             .ToListAsync();
     }
diff --git a/Src/Dlhis.Canteen/Voucher/Controllers/VouchersController.cs b/Src/Dlhis.Canteen/Voucher/Controllers/VouchersController.cs
index da0b65b0..dfd6a8fe 100644
--- a/Src/Dlhis.Canteen/Voucher/Controllers/VouchersController.cs
+++ b/Src/Dlhis.Canteen/Voucher/Controllers/VouchersController.cs
@@ -1,6 +1,4 @@
 using Dlhis.Basic.Vouchers.Request;
-using Dlhis.Canteen.Order.Request;
-using Dlhis.Canteen.Order.Response;
 using Dlhis.Canteen.Tickets.Request;
 using Dlhis.Canteen.Tickets.Services;
 using Dlhis.Canteen.Voucher.Requests;
@@ -39,6 +37,7 @@ public class VouchersController : ControllerBase
     /// <param name="request"></param>
     /// <returns></returns>
     [HttpGet("page")]
+    [IgnoreTenant]
     public async Task<Pagination<VoucherPageResponse>> GetPageAsync([FromQuery] VoucherPageRequest request)
     {
         return await _namedResolver.GetService<IVoucherService>(request.Type.ToString() + "VoucherService").GetPageAsync(request);
diff --git a/Src/Dlhis.Canteen/Voucher/Requests/VoucherPageRequest.cs b/Src/Dlhis.Canteen/Voucher/Requests/VoucherPageRequest.cs
index ff0dab33..7f0616e9 100644
--- a/Src/Dlhis.Canteen/Voucher/Requests/VoucherPageRequest.cs
+++ b/Src/Dlhis.Canteen/Voucher/Requests/VoucherPageRequest.cs
@@ -32,4 +32,9 @@ public class VoucherPageRequest : PageDto
     /// 二级部门
     /// </summary>
     public string DepartmentNoSecond { get; set; }
+
+    /// <summary>
+    /// 筛选厂区
+    /// </summary>
+    public List<string> Factories { get; set; }
 }
\ No newline at end of file
diff --git a/Src/Dlhis.Canteen/Voucher/Services/Implements/BaseVoucherService.cs b/Src/Dlhis.Canteen/Voucher/Services/Implements/BaseVoucherService.cs
index 7168b89a..927bdde6 100644
--- a/Src/Dlhis.Canteen/Voucher/Services/Implements/BaseVoucherService.cs
+++ b/Src/Dlhis.Canteen/Voucher/Services/Implements/BaseVoucherService.cs
@@ -26,12 +26,13 @@ public abstract class BaseVoucherService : IVoucherService
 
     public async Task<Pagination<VoucherPageResponse>> GetPageAsync(VoucherPageRequest request)
     {
-        var tenantId = _currentUser.GetStringTenantId();
+        //var tenantId = _currentUser.GetStringTenantId();
 
         var pagination = await DbContext.Queryable<VoucherEntity>()
             .LeftJoin<VoucherUserInfoEntity>((x, u) => x.No == u.VoucherNo)
             .LeftJoin<GainfoEntity>((x, u, ga) => u.UserCode == ga.Code)
-            .Where((x, u) => x.Type == request.Type && u.Factory == tenantId)
+            .Where((x, u) => x.Type == request.Type)
+            .WhereIF(request.Factories.IsPresent(), (x, u) => request.Factories.Contains(u.Factory))
             .WhereIF(request.UserCode.IsPresent(), (x, u, ga) => u.UserCode == request.UserCode)
             .WhereIF(request.SearchDateTimePeriod.HasValue(),
                 (x, u, ga) => x.CreateTime >= request.SearchDateTimePeriod.Start &&