diff --git a/service/user.go b/service/user.go index 3b153a2..e4abe6a 100644 --- a/service/user.go +++ b/service/user.go @@ -270,13 +270,15 @@ func (_UserService) SearchLimitUsers(keyword string, limit int) ([]model.JoinedU var users = make([]model.User, 0) keywordCond := "%" + keyword + "%" err := global.DB.NewSelect().Model(&users).Relation("Detail"). - Where("user.type = ?", model.USER_TYPE_ENT). + Where("u.type = ?", model.USER_TYPE_ENT). WhereGroup(" and ", func(q *bun.SelectQuery) *bun.SelectQuery { - return q.Where("user.username like ?", keywordCond). - WhereOr("user_detail.name like ?", keywordCond). - WhereOr("user_detail like ?", keywordCond) + return q.Where("u.username like ?", keywordCond). + WhereOr("detail.name like ?", keywordCond). + WhereOr("detail.abbr like ?", keywordCond). + WhereOr("detail.contact like ?", keywordCond). + WhereOr("detail.address like ?", keywordCond) }). - Order("user.created_at asc"). + Order("u.created_at asc"). Limit(limit). Offset(0). Scan(ctx)