diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs index 605371b4..d142f69e 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs @@ -23,18 +23,21 @@ public class DevicePermissionService : IDevicePermissionService private readonly IDbContext _dbContext; private readonly ITenantApi _tenantApi; private readonly INamedResolver _namedResolver; + private readonly ILogger _logger; private readonly IDevicePermissionAnalyzeService _devicePermissionAnalyzeService; private readonly ICurrentUser _currentUser; public DevicePermissionService(IDbContext dbContext, ITenantApi tenantApi, INamedResolver namedResolver, + ILogger logger, IDevicePermissionAnalyzeService devicePermissionAnalyzeService, ICurrentUser currentUser) { _dbContext = dbContext; _tenantApi = tenantApi; _namedResolver = namedResolver; + _logger = logger; _devicePermissionAnalyzeService = devicePermissionAnalyzeService; _currentUser = currentUser; } @@ -107,9 +110,9 @@ public class DevicePermissionService : IDevicePermissionService TenantId = currentTenantId, })); - foreach (var item in usersToDelete) + foreach (var userNo in usersToDelete) { - if (userTenantDeviceCodes.TryGetValue(item, out var permissions)) + if (userTenantDeviceCodes.TryGetValue(userNo, out var permissions)) { foreach (var permission in permissions) { @@ -121,12 +124,13 @@ public class DevicePermissionService : IDevicePermissionService var myDeviceCodes = permissions.SelectMany(x => x.AssignTypes.SelectMany(p => p.Codes)).Distinct().ToList(); if (myDeviceCodes.All(x => x != device.Code)) { + _logger.LogInformation("触发删除:{userNo} . {json}", userNo, permissions.ToJson()); tasksToDelete.Add(new DeviceTaskEntity { Type = DeviceTaskEnumType.Delete, DeviceType = device.Type, UserId = null, - UserNo = item, + UserNo = userNo, DeviceUniqueNo = device.UniqueNo, Status = DeviceTaskStatusEnumType.Wait, Version = 0,