yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 获取权限查看移除crossignore

Browse Source
This commit is contained in:
liguoyang
2024-08-05 13:21:36 +08:00
parent 5d50837ba3
commit ded9ebcbdf
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs
View File

@@ -56,7 +56,6 @@ public class DevicePermissionsController : ControllerBase
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("assignments")] [HttpGet("assignments")]
[CrossTenant]
public async Task<List<Guid>> GetAssignmentsAsync([FromQuery] DeviceGetAssignmentsRequest request) public async Task<List<Guid>> GetAssignmentsAsync([FromQuery] DeviceGetAssignmentsRequest request)
{ {
return await _devicePermissionService.GetAssignmentsAsync(request); return await _devicePermissionService.GetAssignmentsAsync(request);
@@ -67,7 +66,6 @@ public class DevicePermissionsController : ControllerBase
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[IgnoreTenant]
[HttpGet("assignments-unique")] [HttpGet("assignments-unique")]
public async Task<List<GainfoDto>> GetAssignmentUniqueAsync([FromQuery] DeviceGetAssignmentUniquesRequest request) public async Task<List<GainfoDto>> GetAssignmentUniqueAsync([FromQuery] DeviceGetAssignmentUniquesRequest request)
{ {

1
Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
View File

@@ -412,6 +412,7 @@ public class DevicePermissionService : IDevicePermissionService
var downStatus = await _dbContext.Queryable<DeviceTaskEntity>() var downStatus = await _dbContext.Queryable<DeviceTaskEntity>()
.Where(x => userNos.Contains(x.UserNo)) .Where(x => userNos.Contains(x.UserNo))
.Where(x => x.DeviceUniqueNo == device.UniqueNo) .Where(x => x.DeviceUniqueNo == device.UniqueNo)
.Where(x => x.Status == DeviceTaskStatusEnumType.Success)
.Select(x => new .Select(x => new
{ {
num = SqlFunc.RowNumber(SqlFunc.Desc(x.ModifiedTime), x.UserNo), num = SqlFunc.RowNumber(SqlFunc.Desc(x.ModifiedTime), x.UserNo),

2
Src/Dlhis.Sys/Identity/Controllers/UserTenantsController.cs
View File

@@ -9,7 +9,7 @@ namespace Dlhis.Sys.Identity.Controllers;
/// <summary> /// <summary>
/// 用户租户 /// 用户租户
/// </summary> /// </summary>
[Authorize(Roles = "admin")] [Authorize]
[Route("api/[controller]")] [Route("api/[controller]")]
[ApiController] [ApiController]
public class UserTenantsController : ControllerBase public class UserTenantsController : ControllerBase