From 82ef9e8cd616c0295acfe678b485a9a30b74375f Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 4 Apr 2024 14:47:50 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=B8=8A=E4=BC=A0=E4=BA=BA=E8=84=B8?=
 =?UTF-8?q?=E8=A7=A6=E5=8F=91=E4=BB=BB=E5=8A=A1=E5=A4=B1=E8=B4=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Device/Services/Implements/DevicePermissionService.cs  | 7 +++----
 .../Organization/Controllers/GainfosController.cs          | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
index 40290280..a0a80efd 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
@@ -258,17 +258,16 @@ public class DevicePermissionService : IDevicePermissionService
         }
 
         var deivces = await _dbContext.Queryable<DeviceEntity>().Where(x => deviceCodes.Contains(x.Code)).ToListAsync();
-        deviceCodes = deivces.Select(x => x.Code).ToList();
 
-
-        var tasks = deviceCodes.Select(x => new DeviceTaskEntity
+        var tasks = deivces.Select(x => new DeviceTaskEntity
         {
-            DeviceUniqueNo = deivces.First(item => item.Code == x).UniqueNo,
+            DeviceUniqueNo = x.UniqueNo,
             Status = DeviceTaskStatusEnumType.Wait,
             Type = taskType,
             UserNo = userNo,
             CancellationId = 0,
             Version = 0,
+            TenantId = x.TenantId
         })
         .ToList();
 
diff --git a/Src/Dlhis.Basic/Organization/Controllers/GainfosController.cs b/Src/Dlhis.Basic/Organization/Controllers/GainfosController.cs
index 57489142..76c5bafe 100644
--- a/Src/Dlhis.Basic/Organization/Controllers/GainfosController.cs
+++ b/Src/Dlhis.Basic/Organization/Controllers/GainfosController.cs
@@ -72,6 +72,7 @@ public class GainfosController : ControllerBase
     /// </summary>
     /// <returns></returns>
     [HttpPost("face")]
+    [IgnoreTenant]
     [Transactional]
     public async Task UploadFaceAsync(GainfoUploadFaceRequest request)
     {
@@ -84,6 +85,7 @@ public class GainfosController : ControllerBase
     /// <param name="request"></param>
     /// <returns></returns>
     [HttpPost("batchface")]
+    [IgnoreTenant]
     public async Task UploadFaceAsync(List<GainfoUploadFaceRequest> request)
     {
         await _gainfoService.UploadFacesAsync(request);