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
///
[EnumDataType(typeof(GainfoUserTypeEnumType))]
public GainfoUserTypeEnumType UserType { get; set; }
+
+ ///
+ /// 工号
+ ///
+ public string UserCode { get; set; }
+
+ ///
+ /// 设备号
+ ///
+ 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().AS("deviceuploadlog_20250107")
: _dbContext.Queryable();
+ var isNormalSearch = !userTypes.Contains(GainfoUserTypeEnumType.Outsource);
+ var isOutsourceSearch = userTypes.Contains(GainfoUserTypeEnumType.Outsource);
+
var r = await table
.LeftJoin((x, device) => x.DeviceUniqueNo == device.UniqueNo)
.LeftJoin((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;