refactor checkCanCreateRelation

5 years ago · 631348a60c
1 changed files with 2 additions and 1 deletions
--- a/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
@ -382,7 +382,8 @@ public class EntityRelationController extends BaseController {

    private void checkCanCreateRelation(EntityId entityId) throws ThingsboardException {
        SecurityUser currentUser = getCurrentUser();
-        if (!(currentUser.isTenantAdmin() && currentUser.getTenantId().equals(entityId))) {
+        var isTenantAdminAndRelateToSelf = currentUser.isTenantAdmin() && currentUser.getTenantId().equals(entityId);
+        if (!isTenantAdminAndRelateToSelf) {
            checkEntityId(entityId, Operation.WRITE);
        }
    }