TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-15 17:40:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

用户列表可以使用待审核、关键词搜索

Browse Source
This commit is contained in:
GoEdgeLab
2022-01-05 11:12:24 +08:00
parent d7fd2e39e5
commit faad3faa99
4 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/rpc/services/service_user.go
View File

@@ -175,7 +175,7 @@ func (this *UserService) CountAllEnabledUsers(ctx context.Context, req *pb.Count
tx := this.NullTx()
count, err := models.SharedUserDAO.CountAllEnabledUsers(tx, 0, req.Keyword)
count, err := models.SharedUserDAO.CountAllEnabledUsers(tx, 0, req.Keyword, req.IsVerifying)
if err != nil {
return nil, err
}
@@ -191,7 +191,7 @@ func (this *UserService) ListEnabledUsers(ctx context.Context, req *pb.ListEnabl
tx := this.NullTx()
users, err := models.SharedUserDAO.ListEnabledUsers(tx, 0, req.Keyword, req.Offset, req.Size)
users, err := models.SharedUserDAO.ListEnabledUsers(tx, 0, req.Keyword, req.IsVerifying, req.Offset, req.Size)
if err != nil {
return nil, err
}
@@ -548,12 +548,19 @@ func (this *UserService) ComposeUserGlobalBoard(ctx context.Context, req *pb.Com
var result = &pb.ComposeUserGlobalBoardResponse{}
var tx = this.NullTx()
totalUsers, err := models.SharedUserDAO.CountAllEnabledUsers(tx, 0, "")
totalUsers, err := models.SharedUserDAO.CountAllEnabledUsers(tx, 0, "", false)
if err != nil {
return nil, err
}
result.TotalUsers = totalUsers
// 等待审核的用户
countVerifyingUsers, err := models.SharedUserDAO.CountAllVerifyingUsers(tx)
if err != nil {
return nil, err
}
result.CountVerifyingUsers = countVerifyingUsers
countTodayUsers, err := models.SharedUserDAO.SumDailyUsers(tx, timeutil.Format("Ymd"), timeutil.Format("Ymd"))
if err != nil {
return nil, err