Merge pull request #13499 from thingsboard/fix/edqs-state-owner

EDQS: fix null uuid customer id after sync

common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AbstractEntityFields.java

@@ -63,7 +63,12 @@ public class AbstractEntityFields implements EntityFields {
     }
 
     protected UUID checkId(UUID id) {
-        return id != null && !id.equals(EntityId.NULL_UUID) ? id : null;
+        return id == null || id.equals(EntityId.NULL_UUID) ? null : id;
+    }
+
+    @Override
+    public UUID getCustomerId() {
+        return checkId(customerId);
     }
 
 }