Refactor searchTenantIdRecursive for rule chains import

5 years ago · 2d4ac40e25
1 changed files with 3 additions and 1 deletions
--- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
@ -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);