fix datapermission crosstenant
This commit is contained in:
@@ -69,7 +69,7 @@ public class DeviceGroupsController : ControllerBase
|
||||
/// <returns></returns>
|
||||
[HttpPost("assign")]
|
||||
[Transactional]
|
||||
[DataPermission]
|
||||
[CrossTenant]
|
||||
public async Task AssignDevicesAsync(DeviceAssignRequest request)
|
||||
{
|
||||
await _deviceGroupService.AssignDevicesAsync(request);
|
||||
|
||||
@@ -30,7 +30,7 @@ public class DevicePermissionsController : ControllerBase
|
||||
[HttpPost("assign")]
|
||||
[AssignPermissionLimit]
|
||||
[Transactional]
|
||||
[DataPermission]
|
||||
[CrossTenant]
|
||||
public async Task AssignAsync(DevicePermissionSaveRequest request)
|
||||
{
|
||||
await _devicePermissionService.AssignAsync(request);
|
||||
@@ -43,7 +43,7 @@ public class DevicePermissionsController : ControllerBase
|
||||
[HttpPost("assign-unique")]
|
||||
[AssignPermissionLimit]
|
||||
[Transactional]
|
||||
[DataPermission]
|
||||
[CrossTenant]
|
||||
public async Task AssignToUniqueAsync(DevicePermissionsAssignToDeviceRequest request)
|
||||
{
|
||||
await _devicePermissionService.AssignToUniqueAsync(request);
|
||||
@@ -54,8 +54,8 @@ public class DevicePermissionsController : ControllerBase
|
||||
/// </summary>
|
||||
/// <param name="request"></param>
|
||||
/// <returns></returns>
|
||||
[DataPermission(ignoreTenant: true, includeCustom: true)]
|
||||
[HttpGet("assignments")]
|
||||
[CrossTenant]
|
||||
public async Task<List<Guid>> GetAssignmentsAsync([FromQuery] DeviceGetAssignmentsRequest request)
|
||||
{
|
||||
return await _devicePermissionService.GetAssignmentsAsync(request);
|
||||
|
||||
@@ -3,6 +3,7 @@ using Dlhis.Basic.Device.Dtos;
|
||||
using Dlhis.Basic.Device.Request;
|
||||
using Dlhis.Basic.Device.Services;
|
||||
using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
|
||||
using Kurisu.AspNetCore.UnifyResultAndValidation.Aop;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
@@ -28,6 +29,7 @@ public class DevicesConnectController : ControllerBase
|
||||
/// </summary>
|
||||
/// <param name="request"></param>
|
||||
/// <returns></returns>
|
||||
[DisableApiLog]
|
||||
[HttpPost("heartbeat")]
|
||||
[IgnoreTenant]
|
||||
public async Task HeartbeatAsync(DeviceHeartbeatRequest request)
|
||||
|
||||
@@ -45,7 +45,6 @@ public class DevicesController : ControllerBase
|
||||
/// </summary>
|
||||
/// <param name="request"></param>
|
||||
/// <returns></returns>
|
||||
[Authorize(Roles = "admin")]
|
||||
[HttpPost("template")]
|
||||
public async Task SaveTemplateAsync(DeviceTemplateSaveRequest request)
|
||||
{
|
||||
@@ -85,7 +84,7 @@ public class DevicesController : ControllerBase
|
||||
/// <param name="request"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet("page")]
|
||||
[DataPermission(ignoreTenant: true, includeCustom: true)]
|
||||
[DataPermission]
|
||||
public async Task<Pagination<DevicePageResponse>> GetPageAsync([FromQuery] DevicePageRequest request)
|
||||
{
|
||||
return await _deviceService.GetPageAsync(request);
|
||||
@@ -125,26 +124,6 @@ public class DevicesController : ControllerBase
|
||||
await _deviceConnectService.SetRegisterBusinessPlaceAsync(request);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 检查设备是否存在
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpGet("exists")]
|
||||
public async Task<bool> CheckExistsAsync(string deviceUniqueNo)
|
||||
{
|
||||
return await _deviceService.CheckExistsAsync(deviceUniqueNo);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取考勤设备
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpGet("attendances")]
|
||||
public async Task<List<DeviceResponse>> GetAttendanceDevicesAsync()
|
||||
{
|
||||
return await _deviceService.GetAttendanceDevicesAsync();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取考勤在线/离线设备详情列表
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user