From 720bdd54fe1961853b5cd5c2a6d3b478af58fde8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= Date: Sun, 18 Sep 2022 22:24:09 +0800 Subject: [PATCH] =?UTF-8?q?fix(user):=E4=BF=AE=E6=AD=A3=E8=BD=AC=E4=BE=9B?= =?UTF-8?q?=E7=94=B5=E4=BC=81=E4=B8=9A=E5=BF=AB=E9=80=9F=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/user.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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)