dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix EntitiesExportImportControllerSqlTest

Browse Source
This commit is contained in:
Viacheslav Klimov 2022-04-25 14:54:53 +03:00
parent 7e2910ed95
commit 5736e52d3e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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