From e7c70d794858c60d512751f3e842f2123e69cc65 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Mon, 30 Jun 2025 15:45:47 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=A0=B9=E6=8D=AE=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8D=95=E7=8B=AC=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Request/DeviceUploadLogPageRequest.cs              | 10 ++++++++++
 .../Services/Implements/DeviceUploadLogService.cs      |  9 +++++++--
 Src/Dlhis.ScheduledTask/Program.cs                     |  1 -
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Request/DeviceUploadLogPageRequest.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Request/DeviceUploadLogPageRequest.cs
index 90804d8e..fa4c33a9 100644
--- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Request/DeviceUploadLogPageRequest.cs
+++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Request/DeviceUploadLogPageRequest.cs
@@ -29,6 +29,16 @@ public class DeviceUploadLogPageRequest : PageDto
     /// </summary>
     [EnumDataType(typeof(GainfoUserTypeEnumType))]
     public GainfoUserTypeEnumType UserType { get; set; }
+
+    /// <summary>
+    /// 工号
+    /// </summary>
+    public string UserCode { get; set; }
+
+    /// <summary>
+    /// 设备号
+    /// </summary>
+    public string DeviceUniqueNo { get; set; }
 }
 
 public class DeviceUploadLogUserPageRequest : PageDto
diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
index d9409540..0ae6ed35 100644
--- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
+++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
@@ -469,6 +469,9 @@ public class DeviceUploadLogService : IDeviceUploadLogService
             ? _dbContext.Queryable<DeviceUploadLogEntity>().AS("deviceuploadlog_20250107")
             : _dbContext.Queryable<DeviceUploadLogEntity>();
 
+        var isNormalSearch = !userTypes.Contains(GainfoUserTypeEnumType.Outsource);
+        var isOutsourceSearch = userTypes.Contains(GainfoUserTypeEnumType.Outsource);
+
         var r = await table
             .LeftJoin<DeviceEntity>((x, device) => x.DeviceUniqueNo == device.UniqueNo)
             .LeftJoin<GainfoEntity>((x, device, ga) => x.UserUniqueNo == ga.Code)
@@ -477,13 +480,15 @@ public class DeviceUploadLogService : IDeviceUploadLogService
             .Where(x => x.RaiseDateTime >= request.SearchDateTimePeriod.Start && x.RaiseDateTime <= request.SearchDateTimePeriod.End)
             .Where((x, device) => x.Type == type && !SqlFunc.IsNullOrEmpty(x.UserType) && userTypes.Contains(x.UserType))
             .WhereIF(request.Sync.HasValue, x => x.Sync == request.Sync)
-            .WhereIF(request.Search.IsPresent() && userTypes.Contains(GainfoUserTypeEnumType.Outsource), (x, device, ga, os) =>
+            .WhereIF(isOutsourceSearch && request.Search.IsPresent(), (x, device, ga, os) =>
                 x.UserUniqueNo == request.Search
                 || x.DeviceUniqueNo == request.Search
                 || os.Supplier == request.Search
                 || os.SapCode == request.Search
             )
-            .WhereIF(request.Search.IsPresent() && !userTypes.Contains(GainfoUserTypeEnumType.Outsource), (x, device, ga, os) =>
+            .WhereIF(isNormalSearch && request.UserCode.IsPresent(), (x, device, ga, os) => x.UserUniqueNo == request.UserCode)
+            .WhereIF(isNormalSearch && request.DeviceUniqueNo.IsPresent(), (x, device, ga, os) => x.DeviceUniqueNo == request.DeviceUniqueNo)
+            .WhereIF(request.Search.IsPresent() && isNormalSearch, (x, device, ga, os) =>
                 x.UserUniqueNo == request.Search
                 || x.DeviceUniqueNo == request.Search
             )
diff --git a/Src/Dlhis.ScheduledTask/Program.cs b/Src/Dlhis.ScheduledTask/Program.cs
index 2f8108cb..1958c236 100644
--- a/Src/Dlhis.ScheduledTask/Program.cs
+++ b/Src/Dlhis.ScheduledTask/Program.cs
@@ -1,4 +1,3 @@
-using Dlhis.Jip.Api.ClientHandlers;
 using Kurisu.AspNetCore.Cache.Extensions;
 using Kurisu.AspNetCore.Startup;