From 07988e988cacfe6a13148dfa38d3415a77289bff Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Sun, 7 Apr 2024 19:18:15 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=BF=94=E5=9B=9E=E5=A2=9E=E5=8A=A0,?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs          | 2 ++
 .../MealUser/Services/Implements/MealUserService.cs            | 3 +++
 2 files changed, 5 insertions(+)

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
     /// </summary>
     public string UserNo { get; set; }
 
+    public string UserName { get; set; }
+
 
     /// <summary>
     /// 学工号
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<GainfoMealEntity>()
             .LeftJoin<GainfoEntity>((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);