From 072a08564cda53796195c1ba95fe14c4b71e9e20 Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Wed, 11 Dec 2024 11:28:20 +0200
Subject: [PATCH] Use tenant notification providers for system notification
 type

---
 .../service/notification/DefaultNotificationCenter.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationCenter.java b/application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationCenter.java
index d30df7cd65..9a293ada7e 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationCenter.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationCenter.java
@@ -225,13 +225,13 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
         NotificationTemplate notificationTemplate = notificationTemplateService.findTenantOrSystemNotificationTemplate(tenantId, type)
                 .orElseThrow(() -> new IllegalArgumentException("No notification template found for type " + type));
         NotificationRequest notificationRequest = NotificationRequest.builder()
-                .tenantId(TenantId.SYS_TENANT_ID)
+                .tenantId(tenantId)
                 .targets(List.of(targetId.getId()))
                 .templateId(notificationTemplate.getId())
                 .info(info)
                 .originatorEntityId(TenantId.SYS_TENANT_ID)
                 .build();
-        processNotificationRequest(TenantId.SYS_TENANT_ID, notificationRequest, null);
+        processNotificationRequest(tenantId, notificationRequest, null);
     }
 
     private void processNotificationRequestAsync(NotificationProcessingContext ctx, List<NotificationTarget> targets, FutureCallback<NotificationRequestStats> callback) {