diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoPermissions.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoPermissions.cs
index 14707aa6..2bcc5fe4 100644
--- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoPermissions.cs
+++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoPermissions.cs
@@ -8,6 +8,7 @@ using Dlhis.Entity.Canteen.Entities;
 using Dlhis.Entity.Canteen.Enums;
 using Dlhis.Entity.Device.Entities;
 using Dlhis.Entity.Device.Enums;
+using Kurisu.AspNetCore.Utils.Extensions;
 using Kurisu.Core.DataAccess.Dto;
 using Kurisu.SqlSugar.Extensions;
 using Kurisu.SqlSugar.Services;
@@ -72,7 +73,8 @@ public class GainfoPermissions : IGainfoPermissions
     public async Task<List<GetDevicesUnderGroupByUserNoResponse>> GetDevicesUnderGroupByUserNoAsync(string userNo, string deviceGroupCode)
     {
         var deviceGroups = await _dbContext.Queryable<DeviceGroupEntity>().ToListAsync();
-        var currentGroup = deviceGroups.Where(x => x.Code.ToString() == deviceGroupCode).First();
+        var currentGroup = deviceGroups.Where(x => x.Code.ToString() == deviceGroupCode).FirstOrDefault();
+        currentGroup.ThrowIfNull($"{deviceGroupCode}在设备组中不存在");
 
         var groups = RecursionGetNext(currentGroup, deviceGroups).ToList();
 
@@ -100,8 +102,16 @@ public class GainfoPermissions : IGainfoPermissions
                    Type = d.Type,
                    BusinessPlaceCode = bp.Code,
                    BusinessPlaceName = bp.Name,
-                   LastHeartbeatTime = dr.LastHeartbeatTime
-               })
+                   LastHeartbeatTime = dr.LastHeartbeatTime,
+                   UniqueNo = d.UniqueNo,
+                   Supplier = d.Supplier,
+                   DeployPlace = d.DeployPlace,
+                   DeployPosition = d.DeployPosition,
+                   DeployDirection = d.DeployDirection,
+                   TemplateCode = dt.Code,
+                   ConnectionInfo = d.ConnectionInfo,
+                   Enable = d.Enable,
+              })
               .ToListAsync();
             var deviceUniqueNos = page.Select(x => x.UniqueNo).ToList();