Browse Source

Fix EntitiesExportImportControllerSqlTest

pull/6357/head
Viacheslav Klimov 4 years ago
parent
commit
5736e52d3e
  1. 1
      application/src/main/java/org/thingsboard/server/controller/EntitiesExportImportController.java
  2. 2
      application/src/test/java/org/thingsboard/server/controller/sql/EntitiesExportImportControllerSqlTest.java

1
application/src/main/java/org/thingsboard/server/controller/EntitiesExportImportController.java

@ -81,6 +81,7 @@ public class EntitiesExportImportController extends BaseController {
private List<EntityExportData<?>> exportEntitiesByRequest(SecurityUser user, ExportRequest exportRequest) throws ThingsboardException {
List<EntityId> entities = exportableEntitiesService.findEntitiesForRequest(user.getTenantId(), exportRequest);
EntityExportSettings exportSettings = exportRequest.getExportSettings();
if (exportSettings == null) {
exportSettings = EntityExportSettings.builder()

2
application/src/test/java/org/thingsboard/server/controller/sql/EntitiesExportImportControllerSqlTest.java

@ -659,7 +659,7 @@ public class EntitiesExportImportControllerSqlTest extends BaseEntitiesExportImp
exportRequest.setExportSettings(new EntityExportSettings());
exportRequest.setPageSize(10);
exportRequest.setEntityType(entityType);
exportRequest.setCustomerId(customer.getId());
exportRequest.setCustomerId(customer.getUuidId());
exportRequests.add(exportRequest);
}

Loading…
Cancel
Save