From 294b57ca60012fccb2d4dba7cadfc1c1d2d8c4a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Sat, 6 May 2023 14:04:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E8=B6=85=E7=BA=A7=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=B8=8D=E6=8F=90=E7=A4=BA=E5=BC=B1=E5=AF=86=E7=A0=81=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/rpc/services/service_admin.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/internal/rpc/services/service_admin.go b/internal/rpc/services/service_admin.go index 2bd951bf..06d37e8d 100644 --- a/internal/rpc/services/service_admin.go +++ b/internal/rpc/services/service_admin.go @@ -369,7 +369,11 @@ func (this *AdminService) CountAllEnabledAdmins(ctx context.Context, req *pb.Cou return nil, err } - count, err := models.SharedAdminDAO.CountAllEnabledAdmins(tx, req.Keyword, isSuperAdmin && req.HasWeakPassword) + if !isSuperAdmin && req.HasWeakPassword { + return this.SuccessCount(0) + } + + count, err := models.SharedAdminDAO.CountAllEnabledAdmins(tx, req.Keyword, req.HasWeakPassword) if err != nil { return nil, err } @@ -393,7 +397,11 @@ func (this *AdminService) ListEnabledAdmins(ctx context.Context, req *pb.ListEna return nil, err } - admins, err := models.SharedAdminDAO.ListEnabledAdmins(tx, req.Keyword, isSuperAdmin && req.HasWeakPassword, req.Offset, req.Size) + if !isSuperAdmin && req.HasWeakPassword { + return &pb.ListEnabledAdminsResponse{Admins: nil}, nil + } + + admins, err := models.SharedAdminDAO.ListEnabledAdmins(tx, req.Keyword, req.HasWeakPassword, req.Offset, req.Size) if err != nil { return nil, err }