From ded9ebcbdfa009aa08f23f7d5d0c90e8757f9a74 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Mon, 5 Aug 2024 13:21:36 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=8E=B7=E5=8F=96=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E7=A7=BB=E9=99=A4crossignore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Device/Controllers/DevicePermissionsController.cs           | 2 --
 .../Device/Services/Implements/DevicePermissionService.cs       | 1 +
 Src/Dlhis.Sys/Identity/Controllers/UserTenantsController.cs     | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
index 2b6026e6..b93702ea 100644
--- a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
+++ b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
@@ -56,7 +56,6 @@ public class DevicePermissionsController : ControllerBase
     /// <param name="request"></param>
     /// <returns></returns>
     [HttpGet("assignments")]
-    [CrossTenant]
     public async Task<List<Guid>> GetAssignmentsAsync([FromQuery] DeviceGetAssignmentsRequest request)
     {
         return await _devicePermissionService.GetAssignmentsAsync(request);
@@ -67,7 +66,6 @@ public class DevicePermissionsController : ControllerBase
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
-    [IgnoreTenant]
     [HttpGet("assignments-unique")]
     public async Task<List<GainfoDto>> GetAssignmentUniqueAsync([FromQuery] DeviceGetAssignmentUniquesRequest request)
     {
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
index 27685a2b..296311c5 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
@@ -412,6 +412,7 @@ public class DevicePermissionService : IDevicePermissionService
         var downStatus = await _dbContext.Queryable<DeviceTaskEntity>()
             .Where(x => userNos.Contains(x.UserNo))
             .Where(x => x.DeviceUniqueNo == device.UniqueNo)
+            .Where(x => x.Status == DeviceTaskStatusEnumType.Success)
             .Select(x => new
             {
                 num = SqlFunc.RowNumber(SqlFunc.Desc(x.ModifiedTime), x.UserNo),
diff --git a/Src/Dlhis.Sys/Identity/Controllers/UserTenantsController.cs b/Src/Dlhis.Sys/Identity/Controllers/UserTenantsController.cs
index 7425b33f..656b7344 100644
--- a/Src/Dlhis.Sys/Identity/Controllers/UserTenantsController.cs
+++ b/Src/Dlhis.Sys/Identity/Controllers/UserTenantsController.cs
@@ -9,7 +9,7 @@ namespace Dlhis.Sys.Identity.Controllers;
 /// <summary>
 /// 用户租户
 /// </summary>
-[Authorize(Roles = "admin")]
+[Authorize]
 [Route("api/[controller]")]
 [ApiController]
 public class UserTenantsController : ControllerBase