diff --git a/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs b/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs index 81e37ab7..281eea6f 100644 --- a/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs +++ b/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs @@ -30,5 +30,8 @@ public class MealUserResponse /// public decimal BalanceOfSubsidies { get; set; } - + /// + /// 部门名称 + /// + public string DepartmentName { get; set; } } diff --git a/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs b/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs index af29c9a3..3a80bead 100644 --- a/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs +++ b/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs @@ -5,6 +5,7 @@ using Kurisu.Core.DataAccess.Dto; using Kurisu.Core.User.Abstractions; using Kurisu.SqlSugar.Extensions; using Kurisu.SqlSugar.Services; +using Microsoft.CodeAnalysis; namespace Dlhis.Basic.MealUser.Services.Implements; @@ -25,9 +26,10 @@ public class MealUserService : IMealUserService var page = await _dbContext.Queryable() .LeftJoin((x, meal) => x.Code == meal.UserCode) + .LeftJoin((x, meal, dept) => dept.No == x.DepartmentNo) .WhereIF(request.Search.IsPresent(), (x, meal) => x.Code == request.Search || x.Name == request.Search) .Where(x => x.Factory == tenantId) - .Select((x, meal) => new MealUserResponse + .Select((x, meal, dept) => new MealUserResponse { Balance = meal.Balance, BalanceOfRecharge = meal.BalanceOfRecharge,