From 2c0e0ea63646ce985d29d7d175557905407f3a6b Mon Sep 17 00:00:00 2001 From: liguoyang Date: Mon, 24 Jun 2024 21:07:46 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=97=A5=E5=BF=97=E5=8C=BA=E5=88=86?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Implements/DevicePermissionService.cs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs index 1c870be0..4aed72a0 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs @@ -233,7 +233,8 @@ public class DevicePermissionService : IDevicePermissionService _logger.LogInformation("{tenant}任务后置人数{count}", tenantId, userNos.Count); var devices = await _dbContext.Queryable().Where(x => x.Enable).ToListAsync(); - var waitTasks = new List(); + var waitAddTasks = new List(); + var waitDeleteTasks = new List(); foreach (var userNo in userNos) { @@ -268,7 +269,7 @@ public class DevicePermissionService : IDevicePermissionService addItems = addItems.Where(x => deviceCodes.Contains(x)).ToList(); //下发任务创建 - deletedItems.ForEach(x => waitTasks.Add(new DeviceTaskEntity + deletedItems.ForEach(x => waitDeleteTasks.Add(new DeviceTaskEntity { DeviceUniqueNo = devices.First(item => item.Code == x).UniqueNo, Status = DeviceTaskStatusEnumType.Wait, @@ -280,7 +281,7 @@ public class DevicePermissionService : IDevicePermissionService TenantId = tenant, })); - addItems.ForEach(x => waitTasks.Add(new DeviceTaskEntity + addItems.ForEach(x => waitAddTasks.Add(new DeviceTaskEntity { DeviceUniqueNo = devices.First(item => item.Code == x).UniqueNo, Status = DeviceTaskStatusEnumType.Wait, @@ -293,10 +294,14 @@ public class DevicePermissionService : IDevicePermissionService } } - _logger.LogInformation("{tenant}任务产生数量{count}", tenantId, waitTasks.Count); - if (waitTasks.Any()) + _logger.LogInformation("{tenant}任务产生新增数量{addCount},删除数量:{delteCount}", tenantId, waitAddTasks.Count, waitDeleteTasks.Count); + if (waitAddTasks.Any()) { - await _dbContext.InsertAsync(waitTasks); + await _dbContext.InsertAsync(waitAddTasks); + } + if (waitDeleteTasks.Any()) + { + await _dbContext.InsertAsync(waitDeleteTasks); } }