From a440885294360f2e9bbd12aacdd32ab0fa0c3abc Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 19 Dec 2024 11:39:49 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=81=A2=E5=A4=8D=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Device/Controllers/DevicePermissionsController.cs      | 7 +++++++
 .../Device/Services/Implements/DevicePermissionService.cs  | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
index 887b11ea..c040d3bf 100644
--- a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
+++ b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
@@ -100,4 +100,11 @@ public class DevicePermissionsController : ControllerBase
     {
         await _devicePermissionService.ResetGainfoPageByDeviceAsync(request.Code);
     }
+    
+    [HttpGet("userPermissionCodes")]
+    [IgnoreTenant]
+    public async Task<List<Guid>> GetAssignDeviceCodesAsync(string userCode)
+    {
+        return await _devicePermissionService.GetUserDeviceCodesByNoAsync(userCode);
+    }
 }
\ No newline at end of file
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
index dc79662d..6c574e78 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
@@ -441,7 +441,8 @@ public class DevicePermissionService : IDevicePermissionService
     /// <returns></returns>
     public async Task<List<Guid>> GetUserDeviceCodesByNoAsync(string userNo)
     {
-        var result = await _devicePermissionAnalyzeService.GetUserAssignDeviceCodesWithTypeInTenantAsync(new List<string> { userNo });
+        var no = await _dbContext.Queryable<GainfoEntity>().Where(x => x.No == userNo || x.Code == userNo).Select(x => x.No).SingleAsync();
+        var result = await _devicePermissionAnalyzeService.GetUserAssignDeviceCodesWithTypeInTenantAsync(new List<string> { no });
         return result.First().Value.SelectMany(x => x.AssignTypes.SelectMany(p => p.Codes)).Distinct().ToList();
     }
 }
\ No newline at end of file