diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
index 1de491b8..8d3fb5eb 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
@@ -119,7 +119,7 @@ public class DevicePermissionService : IDevicePermissionService
 
     public async Task<List<Guid>> GetAssignmentsAsync(DeviceGetAssignmentsRequest request)
     {
-        var currentTenantId = request.TenantId ??= _currentUser.GetStringTenantId();
+        var currentTenantId = request.AssignType == AssignTypeEnumType.Department ? request.TenantId : _currentUser.GetStringTenantId();
         var role = _currentUser.GetRole();
         var isAll = role is "admin" or "tenant-admin";
         var deviceCodes = _myDataPermissionService.GetMyDeviceCodes();