|
@@ -234,6 +234,9 @@ public class WebGatewayImpl implements WebGateway {
|
|
|
|
|
|
// 执行分页查询
|
|
// 执行分页查询
|
|
Long tenantId = (Long) StpUtil.getSession().get(UserConstants.SA_USER_TENANT_ID);
|
|
Long tenantId = (Long) StpUtil.getSession().get(UserConstants.SA_USER_TENANT_ID);
|
|
|
|
+ if (tenantId == null){
|
|
|
|
+ tenantId = queryReq.getTenantId();
|
|
|
|
+ }
|
|
Page<DevInfo> devInfoPage = devInfoService.queryDevList(queryReq, tenantId);
|
|
Page<DevInfo> devInfoPage = devInfoService.queryDevList(queryReq, tenantId);
|
|
// 换为目标DTO
|
|
// 换为目标DTO
|
|
List<DeviceDTO> deviceDTOList = CopyUtils.copyList(devInfoPage.getRecords(), DeviceDTO.class);
|
|
List<DeviceDTO> deviceDTOList = CopyUtils.copyList(devInfoPage.getRecords(), DeviceDTO.class);
|