diff --git a/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs b/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs index 142e94c1..81e37ab7 100644 --- a/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs +++ b/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs @@ -9,24 +9,16 @@ public class MealUserResponse public string UserName { get; set; } - /// /// 学工号 /// public string UserCode { get; set; } - /// - /// 卡号 - /// - public string CardNo { get; set; } - - /// /// 余额 /// public decimal Balance { get; set; } - /// /// 余额(充值) /// diff --git a/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs b/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs index d1a1b14c..af29c9a3 100644 --- a/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs +++ b/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs @@ -2,6 +2,7 @@ using Dlhis.Entity.Basic.Entity; using Kurisu.AspNetCore.Utils.Extensions; using Kurisu.Core.DataAccess.Dto; +using Kurisu.Core.User.Abstractions; using Kurisu.SqlSugar.Extensions; using Kurisu.SqlSugar.Services; @@ -10,17 +11,22 @@ namespace Dlhis.Basic.MealUser.Services.Implements; public class MealUserService : IMealUserService { private readonly IDbContext _dbContext; + private readonly ICurrentUser _currentUser; - public MealUserService(IDbContext dbContext) + public MealUserService(IDbContext dbContext, ICurrentUser currentUser) { _dbContext = dbContext; + _currentUser = currentUser; } public async Task> GetPageAsync(PageDto request) { + var tenantId = _currentUser.GetStringTenantId(); + var page = await _dbContext.Queryable() - .LeftJoin((x, meal) => x.No == meal.UserNo) + .LeftJoin((x, meal) => x.Code == meal.UserCode) .WhereIF(request.Search.IsPresent(), (x, meal) => x.Code == request.Search || x.Name == request.Search) + .Where(x => x.Factory == tenantId) .Select((x, meal) => new MealUserResponse { Balance = meal.Balance,