fix: 组织设备未包含子组织设备问题修复

@@ -353,8 +353,8 @@ public class YtDeviceController extends BaseController {
     @ApiOperation("获取该组织的所有设备")
     @ApiOperation("获取该组织的所有设备")
     public List<DeviceDTO> getGatewayDevices(
     public List<DeviceDTO> getGatewayDevices(
             @ApiParam(value = "组织ID") @RequestParam("organizationId") String organizationId,
             @ApiParam(value = "组织ID") @RequestParam("organizationId") String organizationId,
-            @ApiParam(value = "设备类型") @PathVariable("deviceType") DeviceTypeEnum deviceType) {
-        return deviceService.findDevicesByDeviceTypeAndOrganizationId(deviceType, organizationId);
+            @ApiParam(value = "设备类型") @PathVariable("deviceType") DeviceTypeEnum deviceType) throws ThingsboardException {
+        return deviceService.findDevicesByDeviceTypeAndOrganizationId(deviceType,getCurrentUser().getCurrentTenantId(), organizationId);
     }
     }
 
 
     @GetMapping("/gateway/{tbDeviceId}")
     @GetMapping("/gateway/{tbDeviceId}")

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
@@ -217,12 +218,13 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
 
 
     @Override
     @Override
     public List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
     public List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
-            DeviceTypeEnum deviceType, String organizationId) {
+            DeviceTypeEnum deviceType, String tenantId, String organizationId) {
+        List<String> orgIds = organizationAllIds(tenantId,organizationId);
         return ReflectUtils.sourceToTarget(
         return ReflectUtils.sourceToTarget(
                 baseMapper.selectList(
                 baseMapper.selectList(
                         new LambdaQueryWrapper<YtDevice>()
                         new LambdaQueryWrapper<YtDevice>()
                                 .eq(YtDevice::getDeviceType, deviceType)
                                 .eq(YtDevice::getDeviceType, deviceType)
-                                .eq(YtDevice::getOrganizationId, organizationId)),
+                                .in(YtDevice::getOrganizationId, orgIds)),
                 DeviceDTO.class);
                 DeviceDTO.class);
     }
     }
 
 
@@ -286,16 +288,7 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
         queryMap.put("tenantId", tenantId);
         queryMap.put("tenantId", tenantId);
         String organizationId = (String) queryMap.get("organizationId");
         String organizationId = (String) queryMap.get("organizationId");
         if (!StringUtils.isEmpty(organizationId)) {
         if (!StringUtils.isEmpty(organizationId)) {
-            List<String> organizationIds = new ArrayList<>();
-            organizationIds.add(organizationId);
-            // 查询该组织的所有子类
-            List<OrganizationDTO> organizationDTOS =
-                    ytOrganizationMapper.findOrganizationTreeList(tenantId, organizationIds);
-            List<String> queryOrganizationIds = new ArrayList<>();
-            organizationDTOS.forEach(
-                    item -> {
-                        queryOrganizationIds.add(item.getId());
-                    });
+            List<String> queryOrganizationIds = organizationAllIds(tenantId, organizationId);
             queryMap.put("organizationIds", queryOrganizationIds);
             queryMap.put("organizationIds", queryOrganizationIds);
         }
         }
         IPage<YtDevice> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
         IPage<YtDevice> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
@@ -311,6 +304,27 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
         return new YtPageData<>(records, deviceIPage.getTotal());
         return new YtPageData<>(records, deviceIPage.getTotal());
     }
     }
 
 
+    /**
+     * 组织结构下的所有组织ID
+     * @param tenantId        租户ID
+     * @param organizationId  组织ID
+     * @return
+     */
+    @NotNull
+    private List<String> organizationAllIds(String tenantId, String organizationId) {
+        List<String> organizationIds = new ArrayList<>();
+        organizationIds.add(organizationId);
+        // 查询该组织的所有子类
+        List<OrganizationDTO> organizationDTOS =
+                ytOrganizationMapper.findOrganizationTreeList(tenantId, organizationIds);
+        List<String> queryOrganizationIds = new ArrayList<>();
+        organizationDTOS.forEach(
+                item -> {
+                    queryOrganizationIds.add(item.getId());
+                });
+        return queryOrganizationIds;
+    }
+
     @Override
     @Override
     public YtPageData<RelationDeviceDTO> pageRelation(Map<String, Object> queryMap) {
     public YtPageData<RelationDeviceDTO> pageRelation(Map<String, Object> queryMap) {
         IPage<YtDevice> page = getPage(queryMap, "last_online_time", false);
         IPage<YtDevice> page = getPage(queryMap, "last_online_time", false);

@@ -48,7 +48,7 @@ public interface YtDeviceService extends BaseService<YtDevice> {
      * @return 设备列表
      * @return 设备列表
      */
      */
     List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
     List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
-            DeviceTypeEnum deviceType, String organizationId);
+            DeviceTypeEnum deviceType, String tenantId, String organizationId);
 
 
     /**
     /**
      * 通过设备ID和租户ID判断该设备是否存在
      * 通过设备ID和租户ID判断该设备是否存在