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); } + /// + /// 获取启用的营业点(所有基地) + /// + /// + [HttpGet("list-all")] + [IgnoreTenant] + public async Task> GetAllList(string tenant) + { + return await _businessPlaceService.GetOpenedListAsync(); + } + /// /// 营业点保存 /// 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 /// 获取可用的营业点 /// /// - Task> GetOpenedListAsync(Guid? placeCode); + Task> GetOpenedListAsync(Guid? placeCode = null, string tenant = null); /// /// 保存营业点 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> GetOpenedListAsync(Guid? placeCode) + public async Task> GetOpenedListAsync(Guid? placeCode = null, string tenant = null) { var list = await _dbContext.Queryable() .LeftJoin((x, ps) => x.Code == ps.PlaceCode) .LeftJoin((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,