Refactor searchTenantIdRecursive for rule chains import

Viacheslav Klimov
1 parent 2814c377
Showing 1 changed file with 3 additions and 1 deletions
dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
--- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
View file @2d4ac40
+++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
View file @2d4ac40
@@ -481,7 +481,9 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
         }
         if (isTenantId) {
             ObjectNode objNode = (ObjectNode) node;
-            objNode.put("id", tenantId.getId().toString());
+            if (objNode.has("id")) {
+                objNode.put("id", tenantId.getId().toString());
+            }
         } else {
             for (JsonNode jsonNode : node) {
                 searchTenantIdRecursive(tenantId, jsonNode);