From fcc1f134ed41c958e9855bba5bfdaa3ebdfc0128 Mon Sep 17 00:00:00 2001 From: cheche <717840555@qq.com> Date: Mon, 18 Mar 2024 12:14:06 +0800 Subject: [PATCH] fix currentUser --- .../Services/Implements/BusinessPlacePermissionsService.cs | 3 ++- Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs | 2 +- .../Response/BusinessShiftMealRelationshipResponse.cs | 7 +++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlacePermissionsService.cs b/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlacePermissionsService.cs index 87f9f422..d8d22f27 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlacePermissionsService.cs +++ b/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlacePermissionsService.cs @@ -13,9 +13,10 @@ public class BusinessPlacePermissionsService : IBusinessPlacePermissionsService private readonly IDbContext _dbContext; private readonly ICurrentUser _currentUser; - public BusinessPlacePermissionsService(IDbContext dbContext) + public BusinessPlacePermissionsService(IDbContext dbContext, ICurrentUser currentUser) { _dbContext = dbContext; + _currentUser = currentUser; } public async Task> GetPageAsync(BusinessPlacePermissionPageRequest request) diff --git a/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs b/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs index 2bbb924e..9b3ed209 100644 --- a/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs +++ b/Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs @@ -93,7 +93,7 @@ public class DishesMenusController : ControllerBase /// /// [HttpGet("setting")] - public async Task GetDishesMenusBookingSetting(GetDishesMenusBookingRequest request) + public async Task GetDishesMenusBookingSetting([FromQuery]GetDishesMenusBookingRequest request) { return await _dishesService.GetDishesMenusBookingSetting(request); } diff --git a/Src/Dlhis.Basic/Dishes/Response/BusinessShiftMealRelationshipResponse.cs b/Src/Dlhis.Basic/Dishes/Response/BusinessShiftMealRelationshipResponse.cs index e36c7b28..1c40fc37 100644 --- a/Src/Dlhis.Basic/Dishes/Response/BusinessShiftMealRelationshipResponse.cs +++ b/Src/Dlhis.Basic/Dishes/Response/BusinessShiftMealRelationshipResponse.cs @@ -1,4 +1,5 @@ using Dlhis.Entity.Canteen.Enums; +using Kurisu.AspNetCore.Utils.Extensions; namespace Dlhis.Basic.Dishes.Response { @@ -20,11 +21,9 @@ namespace Dlhis.Basic.Dishes.Response public ShiftEnumType ShiftType { get; set; } /// - /// 序号 + /// 餐次CN /// - public int Sequence { get; set; } + public string ShiftTypeCN => ShiftType.GetDescription(); - - public string TenantId { get; set; } } }