From 77ffb32f00edf8833781e03251a89baabe52c4ae Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Thu, 20 Aug 2020 16:47:08 +0300
Subject: [PATCH] fix alarm get propagation ids

---
 .../thingsboard/server/dao/alarm/BaseAlarmService.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
index 3064754a1b..f2e768e6b2 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
@@ -391,8 +391,12 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
     }
 
     private Set<EntityId> getPropagationEntityIds(Alarm alarm) {
-        List<EntityRelation> relations = relationService.findByTo(alarm.getTenantId(), alarm.getId(), RelationTypeGroup.ALARM);
-        return relations.stream().map(EntityRelation::getFrom).collect(Collectors.toSet());
+        if (alarm.isPropagate()) {
+            List<EntityRelation> relations = relationService.findByTo(alarm.getTenantId(), alarm.getId(), RelationTypeGroup.ALARM);
+            return relations.stream().map(EntityRelation::getFrom).collect(Collectors.toSet());
+        } else {
+            return Collections.singleton(alarm.getOriginator());
+        }
     }
 
     private void createAlarmRelation(TenantId tenantId, EntityId entityId, EntityId alarmId) {