fix 营业点分页控制

This commit is contained in:
2024-03-21 11:16:23 +08:00
parent 02084be82b
commit a5dcab1d07
3 changed files with 20 additions and 3 deletions

View File

@@ -57,7 +57,7 @@ public class DishesMenusController : ControllerBase
/// <param name="businessPlaceCode"></param> /// <param name="businessPlaceCode"></param>
/// <param name="date"></param> /// <param name="date"></param>
/// <param name="shiftType"></param> /// <param name="shiftType"></param>
/// <param name="categoryCodes"></param> /// <param name="categoryCode"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("dishes-selections")] [HttpGet("dishes-selections")]
public async Task<List<DishesDetailResponse>> GetDishesUnderCurrentMenuAsync(Guid businessPlaceCode, public async Task<List<DishesDetailResponse>> GetDishesUnderCurrentMenuAsync(Guid businessPlaceCode,

View File

@@ -64,6 +64,7 @@ public class BusinessPlacesController : ControllerBase
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[Authorize(Roles = "admin,tenant-admin")]
[HttpPost("save")] [HttpPost("save")]
public async Task SaveAsync(BusinessPlaceSaveRequest request) public async Task SaveAsync(BusinessPlaceSaveRequest request)
{ {

View File

@@ -13,15 +13,18 @@ namespace Dlhis.Basic.BusinessPlace.Services.Implements;
public class BusinessPlaceService : IBusinessPlaceService public class BusinessPlaceService : IBusinessPlaceService
{ {
private readonly IDbContext _dbContext; private readonly IDbContext _dbContext;
private readonly IBusinessPlacePermissionsService _businessPlacePermissionsService;
public BusinessPlaceService(IDbContext dbContext) public BusinessPlaceService(IDbContext dbContext, IBusinessPlacePermissionsService businessPlacePermissionsService)
{ {
_dbContext = dbContext; _dbContext = dbContext;
_businessPlacePermissionsService = businessPlacePermissionsService;
} }
public async Task<Pagination<BusinessPlaceResponse>> GetPageAsync(BusinessPlacePageRequest request) public async Task<Pagination<BusinessPlaceResponse>> GetPageAsync(BusinessPlacePageRequest request)
{ {
var myCodes = await GetMyBusinessPlaceCodesAsync();
var page = await _dbContext.Queryable<BusinessPlaceEntity>() var page = await _dbContext.Queryable<BusinessPlaceEntity>()
.LeftJoin<BusinessPlaceShiftRelationshipEntity>((x, ps) => x.Code == ps.PlaceCode) .LeftJoin<BusinessPlaceShiftRelationshipEntity>((x, ps) => x.Code == ps.PlaceCode)
.LeftJoin<BusinessShiftEntity>((x, ps, s) => s.Code == ps.ShiftCode) .LeftJoin<BusinessShiftEntity>((x, ps, s) => s.Code == ps.ShiftCode)
@@ -30,6 +33,7 @@ public class BusinessPlaceService : IBusinessPlaceService
.WhereIF(request.Catalog.HasValue, x => x.Catalog == request.Catalog) .WhereIF(request.Catalog.HasValue, x => x.Catalog == request.Catalog)
.WhereIF(request.Status.HasValue, x => x.Status == request.Status) .WhereIF(request.Status.HasValue, x => x.Status == request.Status)
.WhereIF(request.Source.HasValue, x => x.Source == request.Source) .WhereIF(request.Source.HasValue, x => x.Source == request.Source)
.Where(x => myCodes.Contains(x.Code))
.Select((x, ps, s) => new BusinessPlaceResponse .Select((x, ps, s) => new BusinessPlaceResponse
{ {
Id = x.Id, Id = x.Id,
@@ -51,12 +55,15 @@ public class BusinessPlaceService : IBusinessPlaceService
public async Task<List<BusinessPlaceListResponse>> GetOpenedListAsync(Guid? placeCode = null, string tenant = null) public async Task<List<BusinessPlaceListResponse>> GetOpenedListAsync(Guid? placeCode = null, string tenant = null)
{ {
var myCodes = await GetMyBusinessPlaceCodesAsync();
var list = await _dbContext.Queryable<BusinessPlaceEntity>() var list = await _dbContext.Queryable<BusinessPlaceEntity>()
.LeftJoin<BusinessPlaceShiftRelationshipEntity>((x, ps) => x.Code == ps.PlaceCode) .LeftJoin<BusinessPlaceShiftRelationshipEntity>((x, ps) => x.Code == ps.PlaceCode)
.LeftJoin<BusinessShiftEntity>((x, ps, s) => s.Code == ps.ShiftCode) .LeftJoin<BusinessShiftEntity>((x, ps, s) => s.Code == ps.ShiftCode)
.Where(x => x.Status == CanteenBusinessPlaceStatusEnumType.Opened) .Where(x => x.Status == CanteenBusinessPlaceStatusEnumType.Opened)
.WhereIF(placeCode.HasValue, x => x.Code == placeCode) .WhereIF(placeCode.HasValue, x => x.Code == placeCode)
.WhereIF(tenant.IsPresent(), x => x.TenantId == tenant) .WhereIF(tenant.IsPresent(), x => x.TenantId == tenant)
.Where(x => myCodes.Contains(x.Code))
.Select((x, ps, s) => new BusinessPlaceListResponse .Select((x, ps, s) => new BusinessPlaceListResponse
{ {
Id = x.Id, Id = x.Id,
@@ -151,4 +158,13 @@ public class BusinessPlaceService : IBusinessPlaceService
existsSameCustomCode.ThrowIfTrue($"自定义手工号[{request.CustomCode}]存在重复,请检查."); existsSameCustomCode.ThrowIfTrue($"自定义手工号[{request.CustomCode}]存在重复,请检查.");
} }
/// <summary>
/// 获取我的营业点
/// </summary>
/// <returns></returns>
private async Task<List<Guid>> GetMyBusinessPlaceCodesAsync()
{
return (await _businessPlacePermissionsService.GetMyAsync()).Select(x => x.Code).ToList();
}
} }