diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs index 76c74083..5849beff 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs @@ -513,11 +513,8 @@ public class DevicePermissionService : IDevicePermissionService var device = await _dbContext.Queryable().SingleAsync(x => x.UniqueNo == deviceUniqueNo); device.ThrowIfNull("设备不存在"); - var userIds = await GetDeviceUserIdsAsync(deviceUniqueNo); - var userCodes = await _dbContext.Queryable() - .Where(x => userIds.Contains(x.Id)) - .Select(x => x.Code) - .ToListAsync(); + var usersQuery = await GetDeviceUsersQueryAsync(deviceUniqueNo, string.Empty, null); + var userCodes = (await usersQuery.ToListAsync()).Select(x=>x.Code); var devicePermissionManuallyUserNos = await GetManuallyDeviceUserNoAsync(device.Code); var visitorUserNos = await GetDeviceUserNosFromVisitorAsync(device.Code);