diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs index 7575648b..8a5579f4 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs @@ -71,7 +71,7 @@ public class DevicePermissionService : IDevicePermissionService var nextUserNos = await GetPermissionUserNosAsync(); if (nextUserNos.Any()) { - userNos = nextUserNos; + userNos = userNos.Concat(nextUserNos).Distinct().ToList(); } var currentDic = await GetAssignDeviceCodesInternalAsync(userNos); @@ -79,6 +79,7 @@ public class DevicePermissionService : IDevicePermissionService var deivces = await _dbContext.Queryable().ToListAsync(); foreach (var userNo in userNos) { + beforeDic.TryGetValue(userNo, out var beforeCodes); beforeCodes ??= new List(); @@ -100,7 +101,6 @@ public class DevicePermissionService : IDevicePermissionService addItems = addItems.Where(x => deviceCodes.Contains(x)).ToList(); var userInfo = await _dbContext.Queryable() - .LeftJoin((ga, department) => department.No == ga.DepartmentNo) .Where(ga => ga.No == userNo) .Select(ga => new {