From 3db76f2318713fadcf2c563c6439ed3309e785b4 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Tue, 2 Jul 2024 18:33:20 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=88=A4=E6=96=AD=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/AssignmentService.cs | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs index 00cc6aaa..5234b18c 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs @@ -219,7 +219,7 @@ public class AssignmentService : IAssignmentService task.ModifiedTime = now; }); - if (await _dbContext.Queryable().Where(x => x.Status == OldDeviceGainfoEnumType.Wait).AnyAsync()) + if (await _dbContext.Queryable().Where(x => x.Status != OldDeviceGainfoEnumType.Deleted).AnyAsync()) { var dCodes = await _dbContext.Queryable() .LeftJoin((x, ga) => x.UserNo == ga.No) @@ -336,18 +336,21 @@ public class AssignmentService : IAssignmentService throw new VersionExceptions("version exceptions"); } - var oldDeviceGainfoWhere = LinqExpressionExtensions.False(); - page.Data.ForEach(item => { oldDeviceGainfoWhere = oldDeviceGainfoWhere.Or(x => x.Code == item.UserCode && x.DeviceUniqueNo == item.DeviceUniqueNo); }); - var oldData = await _dbContext.Queryable().Where(x => x.Status == OldDeviceGainfoEnumType.Wait || x.Status == OldDeviceGainfoEnumType.Error) - .Where(oldDeviceGainfoWhere) - .ToListAsync(); - - page.Data.ForEach(item => + if (await _dbContext.Queryable().Where(x => x.Status != OldDeviceGainfoEnumType.Deleted).AnyAsync()) { - var o = oldData.FirstOrDefault(x => x.Code == item.UserCode && x.DeviceUniqueNo == item.DeviceUniqueNo); - if (o != null) - item.OldUserNo = o.No; - }); + var oldDeviceGainfoWhere = LinqExpressionExtensions.False(); + page.Data.ForEach(item => { oldDeviceGainfoWhere = oldDeviceGainfoWhere.Or(x => x.Code == item.UserCode && x.DeviceUniqueNo == item.DeviceUniqueNo); }); + var oldData = await _dbContext.Queryable().Where(x => x.Status == OldDeviceGainfoEnumType.Wait || x.Status == OldDeviceGainfoEnumType.Error) + .Where(oldDeviceGainfoWhere) + .ToListAsync(); + + page.Data.ForEach(item => + { + var o = oldData.FirstOrDefault(x => x.Code == item.UserCode && x.DeviceUniqueNo == item.DeviceUniqueNo); + if (o != null) + item.OldUserNo = o.No; + }); + } return page.Data; }, 5);