From 766e210f0679848d3c76396f2d0806a0979eb06d Mon Sep 17 00:00:00 2001 From: Chang lue Tsen Date: Mon, 29 Sep 2025 11:18:47 -0400 Subject: [PATCH] fix(node): update FilterNodeParams to use NodeId and adjust query logic for tags --- internal/logic/subscribe/subscribeLogic.go | 12 ++++++------ internal/model/node/model.go | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/internal/logic/subscribe/subscribeLogic.go b/internal/logic/subscribe/subscribeLogic.go index 8e2e7f9..e3dfd73 100644 --- a/internal/logic/subscribe/subscribeLogic.go +++ b/internal/logic/subscribe/subscribeLogic.go @@ -216,12 +216,12 @@ func (l *SubscribeLogic) getServers(userSub *user.Subscribe) ([]*node.Node, erro enable := true _, nodes, err := l.svc.NodeModel.FilterNodeList(l.ctx.Request.Context(), &node.FilterNodeParams{ - Page: 1, - Size: 1000, - ServerId: nodeIds, - Tag: tool.RemoveDuplicateElements(tags...), - Preload: true, - Enabled: &enable, // Only get enabled nodes + Page: 1, + Size: 1000, + NodeId: nodeIds, + Tag: tool.RemoveDuplicateElements(tags...), + Preload: true, + Enabled: &enable, // Only get enabled nodes }) l.Debugf("[Query Subscribe]found servers: %v", len(nodes)) diff --git a/internal/model/node/model.go b/internal/model/node/model.go index 62159ab..8828a99 100644 --- a/internal/model/node/model.go +++ b/internal/model/node/model.go @@ -85,6 +85,7 @@ func (m *customServerModel) FilterNodeList(ctx context.Context, params *FilterNo query = query.Where("server_id IN ?", params.ServerId) } if len(params.Tag) > 0 { + query = query.Where("1 = 0") for _, tag := range params.Tag { query = query.Or("FIND_IN_SET(?,tags)", tag) }