From e3d6f72243f5372ca971dbb554fac898e8f2f1f6 Mon Sep 17 00:00:00 2001
From: cheche <717840555@qq.com>
Date: Wed, 28 Feb 2024 12:13:25 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=A1=A3=E6=A1=88=E7=9A=84=E4=B8=8B=E5=8F=91?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Organization/Response/GainfoDetailResponse.cs            | 2 ++
 .../Organization/Services/Implements/GainfoService.cs        | 5 ++++-
 .../Services/Implements/DeviceTaskAssignmentService.cs       | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs b/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs
index 88f70f3f..ac6e89ef 100644
--- a/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs
+++ b/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs
@@ -109,4 +109,6 @@ public class GainfoDetailResponse
     /// 人脸base64
     /// </summary>
     public string Face { get; set; }
+
+
 }
diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
index 69b10816..de768d1d 100644
--- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
+++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
@@ -396,7 +396,10 @@ public class GainfoService : IGainfoService
 
         if (info != null)
         {
-            info.Face = await _dbContext.ChangeDb("face").Queryable<GainfoFaceEntity>().Where(x => x.UserCode == info.Code).Select(x => x.Face).SingleAsync();
+            if (request.WithFace)
+            {
+                info.Face = await _dbContext.ChangeDb("face").Queryable<GainfoFaceEntity>().Where(x => x.UserCode == info.Code).Select(x => x.Face).SingleAsync();
+            }
         }
 
         return info;
diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
index f844e9df..403ca9fb 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
@@ -2,6 +2,7 @@
 using Dlhis.Entity.Device.Entities;
 using Dlhis.ScheduledTask.TaskAssignment.Request;
 using Dlhis.ScheduledTask.TaskAssignment.Response;
+using Kurisu.AspNetCore.Utils.Extensions;
 using Kurisu.Core.DataAccess.Dto;
 using Kurisu.SqlSugar.Extensions;
 using Kurisu.SqlSugar.Services;
@@ -21,6 +22,7 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
     {
         var page = await _dbContext.Queryable<DeviceTaskEntity>()
             .LeftJoin<GainfoEntity>((deviceTask, ga) => deviceTask.UserNo == ga.No)
+            .WhereIF(!request.Search.IsEmpty(), deviceTask => deviceTask.UserNo == request.Search)
               .Select((deviceTask, ga) => new DeviceTaskAssignmentResponse
               {
                   DeviceUniqueNo = deviceTask.DeviceUniqueNo,