diff --git a/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs b/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs index 27731ec5..142e94c1 100644 --- a/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs +++ b/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs @@ -7,6 +7,8 @@ public class MealUserResponse /// public string UserNo { get; set; } + public string UserName { get; set; } + /// /// 学工号 diff --git a/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs b/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs index 26bde8e4..57476452 100644 --- a/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs +++ b/Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs @@ -1,5 +1,6 @@ using Dlhis.Basic.MealUser.Response; using Dlhis.Entity.Basic.Entity; +using Kurisu.AspNetCore.Utils.Extensions; using Kurisu.Core.DataAccess.Dto; using Kurisu.SqlSugar.Extensions; using Kurisu.SqlSugar.Services; @@ -19,12 +20,14 @@ public class MealUserService : IMealUserService { var page = await _dbContext.Queryable() .LeftJoin((x, ga) => x.UserNo == ga.No) + .WhereIF(request.Search.IsPresent(), (x, ga) => x.UserCode == request.Search || ga.Name == request.Search) .Select((x, ga) => new MealUserResponse { Balance = x.Balance, BalanceOfRecharge = x.BalanceOfRecharge, BalanceOfSubsidies = x.BalanceOfSubsidies, UserCode = ga.Code, + UserName = ga.Name, UserNo = ga.No, }) .ToPageListAsync(request);