diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs index 489c871f..067d1f5a 100644 --- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs +++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs @@ -155,6 +155,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService .LeftJoin((x, device) => x.DeviceUniqueNo == device.UniqueNo) .LeftJoin((x, device, ga) => x.UserUniqueNo == ga.Code) .LeftJoin((x, device, ga, os) => x.UserUniqueNo == os.Code) + .LeftJoin((x, device, ga, os, gasap) => gasap.Code == os.SapCode) .WhereIF(request.SearchDateTimePeriod.HasValue(), x => x.RaiseDateTime >= request.SearchDateTimePeriod.Start && x.RaiseDateTime <= request.SearchDateTimePeriod.End) .Where((x, device) => x.Type == type && !SqlFunc.IsNullOrEmpty(x.UserUniqueNo)) .WhereIF(request.Sync.HasValue, x => x.Sync == request.Sync) @@ -170,13 +171,13 @@ public class DeviceUploadLogService : IDeviceUploadLogService || os.SapCode == request.Search ) .OrderBy(x => x.ModifiedTime, OrderByType.Desc) - .Select((x, device, ga, os) => new DeviceUploadLogResponse + .Select((x, device, ga, os, gasap) => new DeviceUploadLogResponse { Id = x.Id, OriginUserUniqueNo = x.UserUniqueNo, OutsourceSupplier = os.Supplier, SapUserCode = os.SapCode, - //SapUserName = , + SapUserName = gasap.Name, DeviceUniqueNo = x.DeviceUniqueNo, RaiseDateTime = x.RaiseDateTime, CreateTime = x.CreateTime, @@ -190,19 +191,6 @@ public class DeviceUploadLogService : IDeviceUploadLogService }) .ToPageListAsync(request); - - var sapUserCodes = r.Data.Select(x => x.SapUserCode).Distinct().ToList(); - - var gainfos = await _dbContext.Queryable().Where(x => sapUserCodes.Contains(x.Code)).Select(x => new { x.Code, x.Name }).ToListAsync(); - foreach (var item in r.Data) - { - var s = gainfos.FirstOrDefault(x => x.Code == item.SapUserCode); - if (s != null) - { - item.SapUserName = s.Name; - } - } - return r; } } \ No newline at end of file