From 796bab6aa9b33939af2f818fb09dcc564124f523 Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Tue, 11 Jun 2024 12:57:16 +0300
Subject: [PATCH] Fix sysadmin notification being sent with tenant mail sender

---
 .../service/notification/channels/EmailNotificationChannel.java | 2 +-
 .../service/notification/channels/SmsNotificationChannel.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/notification/channels/EmailNotificationChannel.java b/application/src/main/java/org/thingsboard/server/service/notification/channels/EmailNotificationChannel.java
index c7a3d83d8f..2f01e26424 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/channels/EmailNotificationChannel.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/channels/EmailNotificationChannel.java
@@ -33,7 +33,7 @@ public class EmailNotificationChannel implements NotificationChannel<User, Email
 
     @Override
     public void sendNotification(User recipient, EmailDeliveryMethodNotificationTemplate processedTemplate, NotificationProcessingContext ctx) throws Exception {
-        mailService.send(recipient.getTenantId(), null, TbEmail.builder()
+        mailService.send(ctx.getTenantId(), null, TbEmail.builder()
                 .to(recipient.getEmail())
                 .subject(processedTemplate.getSubject())
                 .body(processedTemplate.getBody())
diff --git a/application/src/main/java/org/thingsboard/server/service/notification/channels/SmsNotificationChannel.java b/application/src/main/java/org/thingsboard/server/service/notification/channels/SmsNotificationChannel.java
index a45b555ced..7be61c4fa7 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/channels/SmsNotificationChannel.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/channels/SmsNotificationChannel.java
@@ -38,7 +38,7 @@ public class SmsNotificationChannel implements NotificationChannel<User, SmsDeli
             throw new RuntimeException("User does not have phone number");
         }
 
-        smsService.sendSms(recipient.getTenantId(), recipient.getCustomerId(), new String[]{phone}, processedTemplate.getBody());
+        smsService.sendSms(ctx.getTenantId(), null, new String[]{phone}, processedTemplate.getBody());
     }
 
     @Override