diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs index a0a80efd..3a27b23d 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs @@ -295,7 +295,8 @@ public class DevicePermissionService : IDevicePermissionService var devices = await _dbContext.Queryable().ToListAsync(); var deviceRegistries = await _dbContext.Queryable().Where(x => !SqlFunc.IsNullOrEmpty(x.BusinessPlaceCode)).ToListAsync(); - var gainfo = await _dbContext.Queryable().Where(x => x.No == userNo).SingleAsync(); + var gainfo = await _dbContext.Queryable().Where(x => x.No == userNo).SingleAsync() + ?? await _dbContext.Queryable().AS("GainfoLeave").Where(x => x.No == userNo).SingleAsync(); var gainfoGroups = await _dbContext.Queryable().ToListAsync(); var devicePermissions = await _dbContext.Queryable().ToListAsync(); diff --git a/Src/Dlhis.Basic/Organization/Controllers/GainfoPermissionsController.cs b/Src/Dlhis.Basic/Organization/Controllers/GainfoPermissionsController.cs index fbee4251..465ddc8d 100644 --- a/Src/Dlhis.Basic/Organization/Controllers/GainfoPermissionsController.cs +++ b/Src/Dlhis.Basic/Organization/Controllers/GainfoPermissionsController.cs @@ -72,6 +72,7 @@ public class GainfoPermissionsController : ControllerBase /// /// /// + [Authorize(Roles = "admin,tenant-admin")] [HttpPost("reset")] [IgnoreTenant] public async Task ResetPermissionsAsync(GainfoPermissionResetRequest request)