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 /// /// [HttpGet("assignments")] - [CrossTenant] public async Task> GetAssignmentsAsync([FromQuery] DeviceGetAssignmentsRequest request) { return await _devicePermissionService.GetAssignmentsAsync(request); @@ -67,7 +66,6 @@ public class DevicePermissionsController : ControllerBase /// /// /// - [IgnoreTenant] [HttpGet("assignments-unique")] public async Task> 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() .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; /// /// 用户租户 /// -[Authorize(Roles = "admin")] +[Authorize] [Route("api/[controller]")] [ApiController] public class UserTenantsController : ControllerBase