...
|
...
|
@@ -365,6 +365,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev |
365
|
365
|
List<String> queryOrganizationIds = organizationAllIds(tenantId, organizationId);
|
366
|
366
|
queryMap.put("organizationIds", queryOrganizationIds);
|
367
|
367
|
}
|
|
368
|
+ //用于数据流转已选,待选过滤============开始
|
368
|
369
|
if (StringUtils.isNotEmpty(convertConfigId)) {
|
369
|
370
|
ConvertConfigDTO configDTO =
|
370
|
371
|
convertConfigService.findConvertConfigDTOById(tenantId, convertConfigId);
|
...
|
...
|
@@ -380,6 +381,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev |
380
|
381
|
}
|
381
|
382
|
}
|
382
|
383
|
}
|
|
384
|
+ //用于数据流转已选,待选过滤============结束
|
383
|
385
|
IPage<TkDeviceEntity> page =
|
384
|
386
|
getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
|
385
|
387
|
IPage<DeviceDTO> deviceIPage = baseMapper.getDevicePage(page, queryMap);
|
...
|
...
|
|