From 37866bcfa5d39ce7792e7391d0612d74c7736804 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= <qu_xuan@icloud.com>
Date: Mon, 29 Dec 2025 10:15:38 +0800
Subject: [PATCH] fix(monitor): alert filter by owner (#24000)

---
 pkg/monitor/models/monitorscoperesource.go | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkg/monitor/models/monitorscoperesource.go b/pkg/monitor/models/monitorscoperesource.go
index 8319e4c218..9ab040e518 100644
--- a/pkg/monitor/models/monitorscoperesource.go
+++ b/pkg/monitor/models/monitorscoperesource.go
@@ -39,9 +39,20 @@ func (m *SMonitorScopedResourceManager) FilterByOwner(ctx context.Context, q *sq
 	}
 	switch scope {
 	case rbacscope.ScopeDomain:
-		q = q.Equals("domain_id", ownerId.GetProjectDomainId())
+		q = q.Filter(
+			sqlchemy.OR(
+				sqlchemy.Equals(q.Field("domain_id"), ownerId.GetProjectDomainId()),
+				sqlchemy.IsNullOrEmpty(q.Field("domain_id")),
+			),
+		)
 	case rbacscope.ScopeProject:
-		q = q.Equals("tenant_id", ownerId.GetProjectId())
+		q = q.Filter(
+			sqlchemy.OR(
+				sqlchemy.Equals(q.Field("tenant_id"), ownerId.GetProjectId()),
+				sqlchemy.IsNullOrEmpty(q.Field("domain_id")),
+				sqlchemy.Equals(q.Field("domain_id"), ownerId.GetProjectDomainId()),
+			),
+		)
 	}
 	return q
 }