diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
index 06701a75..2cced022 100644
--- a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
+++ b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
@@ -109,9 +109,9 @@ public class DevicePermissionsController : ControllerBase
///
[HttpGet("gainfo-all")]
[IgnoreTenant]
- public async Task GetDeviceUserCodesAsync(string deviceUniqueNo)
+ public async Task> GetDeviceUserCodesAsync(string deviceUniqueNo)
{
- await _devicePermissionService.GetDeviceUserCodesAsync(deviceUniqueNo);
+ return await _devicePermissionService.GetDeviceUserCodesAsync(deviceUniqueNo);
}
[HttpGet("userPermissionCodes")]
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
index ba03d183..0d632232 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
@@ -474,7 +474,7 @@ public class DevicePermissionService : IDevicePermissionService
device.ThrowIfNull("设备不存在");
var userIds = await GetDeviceUserIdsAsync(deviceUniqueNo);
- return userIds.Select(x => x.ToString()).ToList();
+
var devicePermissionManuallyUserNos = await _dbContext.Queryable()
.Where(x => SqlFunc.Subqueryable()
.Where(p => p.DeviceCode == device.Code)