diff --git a/Src/Dlhis.ScheduledTask/Jobs/SyncOriginCardInfoJob.cs b/Src/Dlhis.ScheduledTask/Jobs/SyncOriginCardInfoJob.cs index fa2a107e..9803d4fd 100644 --- a/Src/Dlhis.ScheduledTask/Jobs/SyncOriginCardInfoJob.cs +++ b/Src/Dlhis.ScheduledTask/Jobs/SyncOriginCardInfoJob.cs @@ -35,16 +35,17 @@ public class SyncOriginCardInfoJob : BaseJob var deviceUniqueNos = devices.Select(x => x.UniqueNo).ToList(); var requests = await DbContext.Queryable() + .LeftJoin((x, device) => x.DeviceUniqueNo == device.UniqueNo) .Where(x => deviceUniqueNos.Contains(x.DeviceUniqueNo)) .Where(x => !string.IsNullOrEmpty(x.UserUniqueNo)) .Where(x => x.Sync == false) .Where(x => SqlFunc.Subqueryable().Where(p => p.Code == x.UserUniqueNo).Any()) .Where(x => SqlFunc.Subqueryable().Where(p => p.Code == x.UserUniqueNo).NotAny()) - .Select(x => new UploadAttendanceRequest + .Select((x, device) => new UploadAttendanceRequest { Id = x.Id, RaiseDateTime = x.RaiseDateTime, - ZNOTE = devices.First(item => item.UniqueNo == x.DeviceUniqueNo).DeployPlace, + ZNOTE = device.DeployPlace, ZWORKCODE = x.UserUniqueNo.TrimEnd('\0') }) .ToListAsync();