From b828a0738f3c26ec24e4dd0bd3deea6635ab36b3 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Mon, 23 Jun 2025 17:09:38 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=93=8D=E5=BA=94=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Device/Controllers/DevicePermissionsController.cs | 4 ++-- .../Device/Services/Implements/DevicePermissionService.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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)