Merge branch 'rc' of github.com:thingsboard/thingsboard into rc

1 year ago · 9a3ab5348b
1 changed files with 1 additions and 1 deletions
--- a/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/EntityExportData.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/EntityExportData.java
@ -107,7 +107,7 @@ public class EntityExportData<E extends ExportableEntity<? extends EntityId>> {
    @JsonIgnore
    public boolean hasCalculatedFields() {
-        return calculatedFields != null;
+        return calculatedFields != null && !calculatedFields.isEmpty();
    }
 }