|
|
@@ -491,7 +491,7 @@ func SearchEmails(ctx context.Context, opts *SearchEmailOptions) ([]*SearchEmail |
|
|
|
cond = cond.And(builder.Eq{"email_address.is_activated": false}) |
|
|
|
} |
|
|
|
|
|
|
|
count, err := db.GetEngine(ctx).Join("INNER", "`user`", "`user`.ID = email_address.uid"). |
|
|
|
count, err := db.GetEngine(ctx).Join("INNER", "`user`", "`user`.id = email_address.uid"). |
|
|
|
Where(cond).Count(new(EmailAddress)) |
|
|
|
if err != nil { |
|
|
|
return nil, 0, fmt.Errorf("Count: %w", err) |
|
|
@@ -507,7 +507,7 @@ func SearchEmails(ctx context.Context, opts *SearchEmailOptions) ([]*SearchEmail |
|
|
|
emails := make([]*SearchEmailResult, 0, opts.PageSize) |
|
|
|
err = db.GetEngine(ctx).Table("email_address"). |
|
|
|
Select("email_address.*, `user`.name, `user`.full_name"). |
|
|
|
Join("INNER", "`user`", "`user`.ID = email_address.uid"). |
|
|
|
Join("INNER", "`user`", "`user`.id = email_address.uid"). |
|
|
|
Where(cond). |
|
|
|
OrderBy(orderby). |
|
|
|
Limit(opts.PageSize, (opts.Page-1)*opts.PageSize). |