From 5a47bf3b8b1a96d203ab2670a04128d136a0f7e7 Mon Sep 17 00:00:00 2001
From: desoliture <ikozka@thingsboard.io>
Date: Wed, 19 Jan 2022 16:35:30 +0200
Subject: [PATCH] refactor

---
 .../server/controller/EntityRelationController.java           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java b/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
index 44cc111336..7e15d2f692 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
@@ -379,10 +379,10 @@ public class EntityRelationController extends BaseController {
 
     private void checkRelation(EntityId from, EntityId to) throws ThingsboardException {
         UUID currentUserTenantId = getCurrentUser().getTenantId().getId();
-        if (from.getEntityType() != EntityType.TENANT || !from.getId().equals(currentUserTenantId)) {
+        if (!(from.getEntityType() == EntityType.TENANT && from.getId().equals(currentUserTenantId))) {
             checkEntityId(from, Operation.WRITE);
         }
-        if (to.getEntityType() != EntityType.TENANT || !to.getId().equals(currentUserTenantId)) {
+        if (!(to.getEntityType() == EntityType.TENANT && to.getId().equals(currentUserTenantId))) {
             checkEntityId(to, Operation.WRITE);
         }
     }