Put external Id into Context

4 years ago · fe4ec688b0
1 changed files with 3 additions and 1 deletions
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DefaultEntityExportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DefaultEntityExportService.java
@ -74,7 +74,9 @@ public class DefaultEntityExportService<I extends EntityId, E extends Exportable
        exportData.setEntityType(entityId.getEntityType());
        setAdditionalExportData(ctx, entity, exportData);

-        entity.setId(entity.getExternalId() != null ? entity.getExternalId() : entity.getId());
+        var externalId = entity.getExternalId() != null ? entity.getExternalId() : entity.getId();
+        ctx.putExternalId(entityId, externalId);
+        entity.setId(externalId);
        entity.setTenantId(null);

        return exportData;