From 82d30ca9586afe90fd6e15e237dd16f421a72f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Sun, 3 Oct 2021 14:43:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BD=BF=E7=94=A8=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2ACME=E7=94=A8=E6=88=B7=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E7=9A=84API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/acme/acme_user_dao.go | 5 ++++- internal/rpc/services/service_acme_user.go | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/db/models/acme/acme_user_dao.go b/internal/db/models/acme/acme_user_dao.go index dff285a8..2b9d5748 100644 --- a/internal/db/models/acme/acme_user_dao.go +++ b/internal/db/models/acme/acme_user_dao.go @@ -124,7 +124,7 @@ func (this *ACMEUserDAO) UpdateACMEUserRegistration(tx *dbs.Tx, acmeUserId int64 } // CountACMEUsersWithAdminId 计算用户数量 -func (this *ACMEUserDAO) CountACMEUsersWithAdminId(tx *dbs.Tx, adminId int64, userId int64) (int64, error) { +func (this *ACMEUserDAO) CountACMEUsersWithAdminId(tx *dbs.Tx, adminId int64, userId int64, accountId int64) (int64, error) { query := this.Query(tx) if adminId > 0 { query.Attr("adminId", adminId) @@ -132,6 +132,9 @@ func (this *ACMEUserDAO) CountACMEUsersWithAdminId(tx *dbs.Tx, adminId int64, us if userId > 0 { query.Attr("userId", userId) } + if accountId > 0 { + query.Attr("accountId", accountId) + } return query. State(ACMEUserStateEnabled). diff --git a/internal/rpc/services/service_acme_user.go b/internal/rpc/services/service_acme_user.go index 648c0a23..9bea2f58 100644 --- a/internal/rpc/services/service_acme_user.go +++ b/internal/rpc/services/service_acme_user.go @@ -91,7 +91,7 @@ func (this *ACMEUserService) CountACMEUsers(ctx context.Context, req *pb.CountAc tx := this.NullTx() - count, err := acmemodels.SharedACMEUserDAO.CountACMEUsersWithAdminId(tx, adminId, userId) + count, err := acmemodels.SharedACMEUserDAO.CountACMEUsersWithAdminId(tx, adminId, userId, req.AcmeProviderAccountId) if err != nil { return nil, err }