Merge branch 'development'

Src/Dlhis.Basic/Organization/Controllers/GainfoPermissionsController.cs

@@ -1,13 +1,15 @@
-using System.ComponentModel.DataAnnotations;
-using Dlhis.Basic.BusinessPlace.Response;
+using Dlhis.Basic.BusinessPlace.Response;
 using Dlhis.Basic.Device.Response;
+using Dlhis.Basic.Device.Services;
 using Dlhis.Basic.Organization.Request;
 using Dlhis.Basic.Organization.Response;
 using Dlhis.Basic.Organization.Services;
 using Dlhis.Basic.Organization.Services.Implements;
+using Dlhis.Entity.Device.Entities;
 using Kurisu.Core.DataAccess.Dto;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Org.BouncyCastle.Asn1.Ocsp;
 
 namespace Dlhis.Basic.Organization.Controllers;
 
@@ -42,7 +44,7 @@ public class GainfoPermissionsController : ControllerBase
     /// <param name="deviceGroupCode"></param>
     /// <returns></returns>
     [HttpGet("devicesUnderGroupByUserNo")]
-    public async Task<List<GetDevicesUnderGroupByUserNoResponse>> GetDevicesUnderGroupByUserNoAsync(string userNo, string deviceGroupCode)
+    public async Task<List<GetDevicesUnderGroupByUserNoResponse>> GetDevicesUnderGroupByUserNoAsync(string userNo, Guid deviceGroupCode)
     {
         return await _gainfoPermissions.GetDevicesUnderGroupByUserNoAsync(userNo, deviceGroupCode);
     }
@@ -57,4 +59,14 @@ public class GainfoPermissionsController : ControllerBase
     {
         return await _gainfoPermissions.GetAssignDeviceCodesAsync(request);
     }
+
+    /// <summary>
+    /// 当前绑定的设备组信息
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("assignGroups")]
+    public async Task<List<DeviceGroupTreeResponse>> GetAssignGroupAsync(string userNo)
+    {
+        return await _gainfoPermissions.GetAssignGroupAsync(userNo);
+    }
 }