From 1433d54250b681b50840849c8256c5ebdecf361c Mon Sep 17 00:00:00 2001
From: Nikita Mazurenko <nikitamazurenko42@gmail.com>
Date: Thu, 4 Dec 2025 10:58:31 +0200
Subject: [PATCH] Fix dashboard assignments update in BaseDashboardProcessor

---
 .../edge/rpc/processor/dashboard/BaseDashboardProcessor.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/dashboard/BaseDashboardProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/dashboard/BaseDashboardProcessor.java
index e2dc391d8e..8a202289f3 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/dashboard/BaseDashboardProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/dashboard/BaseDashboardProcessor.java
@@ -57,14 +57,15 @@ public abstract class BaseDashboardProcessor extends BaseEdgeProcessor {
             dashboard.setId(dashboardId);
             dashboard.setAssignedCustomers(dashboardById.getAssignedCustomers());
         }
+
         if (isSaveRequired(dashboardById, dashboard)) {
             dashboardValidator.validate(dashboard, Dashboard::getTenantId);
             if (created) {
                 dashboard.setId(dashboardId);
             }
-            Dashboard savedDashboard = edgeCtx.getDashboardService().saveDashboard(dashboard, false);
-            updateDashboardAssignments(tenantId, customerId, dashboardById, savedDashboard, newAssignedCustomers);
+            dashboard = edgeCtx.getDashboardService().saveDashboard(dashboard, false);
         }
+        updateDashboardAssignments(tenantId, customerId, dashboardById, dashboard, newAssignedCustomers);
         return created;
     }