From b0b54b26ddf0ba61ff17c5e6be68ffdb8d22cbe1 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Thu, 18 Apr 2024 21:07:49 +0200
Subject: [PATCH] alarm repository UUID.fromString for non-null assigneeId

---
 .../java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java
index a8b74c2b1b..57de807d77 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java
@@ -281,7 +281,7 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
                 asf.hasClearFilter() && asf.getClearFilter(),
                 asf.hasAckFilter(),
                 asf.hasAckFilter() && asf.getAckFilter(),
-                UUID.fromString(assigneeId));
+                assigneeId == null ? null : UUID.fromString(assigneeId));
     }
 
     @Override