From 16100f3d04ed731e38f38b80acd62b762eb466ef Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Sun, 7 Apr 2024 20:30:31 +0800
Subject: [PATCH] =?UTF-8?q?fix=20null=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Device/Services/Implements/DevicePermissionService.cs      | 3 ++-
 .../Organization/Controllers/GainfoPermissionsController.cs    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

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<DeviceEntity>().ToListAsync();
         var deviceRegistries = await _dbContext.Queryable<DeviceRegistryEntity>().Where(x => !SqlFunc.IsNullOrEmpty(x.BusinessPlaceCode)).ToListAsync();
 
-        var gainfo = await _dbContext.Queryable<GainfoEntity>().Where(x => x.No == userNo).SingleAsync();
+        var gainfo = await _dbContext.Queryable<GainfoEntity>().Where(x => x.No == userNo).SingleAsync()
+            ?? await _dbContext.Queryable<GainfoEntity>().AS("GainfoLeave").Where(x => x.No == userNo).SingleAsync();
         var gainfoGroups = await _dbContext.Queryable<GainfoGroupRelationshipEntity>().ToListAsync();
 
         var devicePermissions = await _dbContext.Queryable<DevicePermissionEntity>().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
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
+    [Authorize(Roles = "admin,tenant-admin")]
     [HttpPost("reset")]
     [IgnoreTenant]
     public async Task ResetPermissionsAsync(GainfoPermissionResetRequest request)