From 6e776417cb5782b40e9b6ab880bb6ba6bb3db7dd Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Mon, 18 Jul 2022 14:34:55 +0300
Subject: [PATCH] Fix references to tenant

---
 .../sync/ie/importing/impl/BaseEntityImportService.java       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java
index dae246ec49..4fdd6cf6ab 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java
@@ -308,6 +308,10 @@ public abstract class BaseEntityImportService<I extends EntityId, E extends Expo
         public <ID extends EntityId> ID getInternalId(ID externalId, boolean throwExceptionIfNotFound) {
             if (externalId == null || externalId.isNullUid()) return null;
 
+            if (EntityType.TENANT.equals(externalId.getEntityType())) {
+                return (ID) ctx.getTenantId();
+            }
+
             EntityId localId = ctx.getInternalId(externalId);
             if (localId != null) {
                 return (ID) localId;