From bd4a47d2a183643fdf5b283aa20653da8c1074ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Wed, 13 Apr 2022 15:01:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=88=97=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BF=A1=E6=81=AF=E4=B8=AD=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?UserId=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/rpc/services/service_server.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/internal/rpc/services/service_server.go b/internal/rpc/services/service_server.go index 5cfacc26..30c1741b 100644 --- a/internal/rpc/services/service_server.go +++ b/internal/rpc/services/service_server.go @@ -609,13 +609,17 @@ func (this *ServerService) CountAllEnabledServersMatch(ctx context.Context, req // ListEnabledServersMatch 列出单页服务 func (this *ServerService) ListEnabledServersMatch(ctx context.Context, req *pb.ListEnabledServersMatchRequest) (*pb.ListEnabledServersMatchResponse, error) { // 校验请求 - _, _, err := this.ValidateAdminAndUser(ctx, 0, req.UserId) + _, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) if err != nil { return nil, err } tx := this.NullTx() + if userId > 0 { + req.UserId = userId + } + servers, err := models.SharedServerDAO.ListEnabledServersMatch(tx, req.Offset, req.Size, req.ServerGroupId, req.Keyword, req.UserId, req.NodeClusterId, req.AuditingFlag, utils.SplitStrings(req.ProtocolFamily, ",")) if err != nil { return nil, err @@ -644,8 +648,9 @@ func (this *ServerService) ListEnabledServersMatch(ctx context.Context, req *pb. continue } pbGroups = append(pbGroups, &pb.ServerGroup{ - Id: int64(group.Id), - Name: group.Name, + Id: int64(group.Id), + Name: group.Name, + UserId: int64(group.UserId), }) } }