From 1c7a054ed48b80d0c7617b1d53e2a36272004abf Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Tue, 19 Mar 2024 15:53:22 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E8=90=A5=E4=B8=9A=E7=82=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/BusinessPlacesController.cs           | 11 +++++++++++
 .../BusinessPlace/Services/IBusinessPlaceService.cs   |  2 +-
 .../Services/Implements/BusinessPlaceService.cs       |  3 ++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs b/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs
index acbc9541..e9a8e1a6 100644
--- a/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs
+++ b/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs
@@ -48,6 +48,17 @@ public class BusinessPlacesController : ControllerBase
         return await _businessPlaceService.GetOpenedListAsync(placeCode);
     }
 
+    /// <summary>
+    /// 获取启用的营业点(所有基地)
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("list-all")]
+    [IgnoreTenant]
+    public async Task<List<BusinessPlaceListResponse>> GetAllList(string tenant)
+    {
+        return await _businessPlaceService.GetOpenedListAsync();
+    }
+
     /// <summary>
     /// 营业点保存
     /// </summary>
diff --git a/Src/Dlhis.Basic/BusinessPlace/Services/IBusinessPlaceService.cs b/Src/Dlhis.Basic/BusinessPlace/Services/IBusinessPlaceService.cs
index 7228c137..959cb041 100644
--- a/Src/Dlhis.Basic/BusinessPlace/Services/IBusinessPlaceService.cs
+++ b/Src/Dlhis.Basic/BusinessPlace/Services/IBusinessPlaceService.cs
@@ -17,7 +17,7 @@ public interface IBusinessPlaceService : IScopeDependency
     /// 获取可用的营业点
     /// </summary>
     /// <returns></returns>
-    Task<List<BusinessPlaceListResponse>> GetOpenedListAsync(Guid? placeCode);
+    Task<List<BusinessPlaceListResponse>> GetOpenedListAsync(Guid? placeCode = null, string tenant = null);
 
     /// <summary>
     /// 保存营业点
diff --git a/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlaceService.cs b/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlaceService.cs
index 79a25b9f..2e91ff5a 100644
--- a/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlaceService.cs
+++ b/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlaceService.cs
@@ -49,13 +49,14 @@ public class BusinessPlaceService : IBusinessPlaceService
     }
 
 
-    public async Task<List<BusinessPlaceListResponse>> GetOpenedListAsync(Guid? placeCode)
+    public async Task<List<BusinessPlaceListResponse>> GetOpenedListAsync(Guid? placeCode = null, string tenant = null)
     {
         var list = await _dbContext.Queryable<BusinessPlaceEntity>()
                 .LeftJoin<BusinessPlaceShiftRelationshipEntity>((x, ps) => x.Code == ps.PlaceCode)
                 .LeftJoin<BusinessShiftEntity>((x, ps, s) => s.Code == ps.ShiftCode)
                 .Where(x => x.Status == CanteenBusinessPlaceStatusEnumType.Opened)
                 .WhereIF(placeCode.HasValue, x => x.Code == placeCode)
+                .WhereIF(tenant.IsPresent(), x => x.TenantId == tenant)
                 .Select((x, ps, s) => new BusinessPlaceListResponse
                 {
                     Id = x.Id,