From 180e86c64391c2ed5ac31062f80987f5ea730b2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Tue, 17 Oct 2023 13:49:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E4=B8=8D=E8=83=BD=E6=8C=87=E5=AE=9A=E9=9B=86=E7=BE=A4?=
 =?UTF-8?q?=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/db/models/message_dao.go          | 2 +-
 internal/db/models/message_receiver_dao.go | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/internal/db/models/message_dao.go b/internal/db/models/message_dao.go
index aac76c91..405c84dd 100644
--- a/internal/db/models/message_dao.go
+++ b/internal/db/models/message_dao.go
@@ -118,7 +118,7 @@ func (this *MessageDAO) CreateClusterMessage(tx *dbs.Tx, role string, clusterId
 	}
 
 	// 发送给媒介接收人
-	err = SharedMessageTaskDAO.CreateMessageTasks(tx, role, 0, 0, 0, messageType, subject, body)
+	err = SharedMessageTaskDAO.CreateMessageTasks(tx, role, clusterId, 0, 0, messageType, subject, body)
 	if err != nil {
 		return err
 	}
diff --git a/internal/db/models/message_receiver_dao.go b/internal/db/models/message_receiver_dao.go
index e604f887..3665c6b3 100644
--- a/internal/db/models/message_receiver_dao.go
+++ b/internal/db/models/message_receiver_dao.go
@@ -128,6 +128,8 @@ func (this *MessageReceiverDAO) FindEnabledBestFitReceivers(tx *dbs.Tx, role str
 	} else if nodeId > 0 {
 		query.Attr("nodeId", nodeId)
 	} else if clusterId > 0 {
+		query.Attr("serverId", 0)
+		query.Attr("nodeId", 0)
 		query.Attr("clusterId", clusterId)
 	}
 	_, err = query.