From e5ac0decaf3a0757317d7c35e199aab585e9a617 Mon Sep 17 00:00:00 2001 From: alimy Date: Sun, 12 Jun 2022 01:43:44 +0800 Subject: [PATCH] optimize #52 --- internal/dao/user.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/dao/user.go b/internal/dao/user.go index a78c8467..ab0d72a8 100644 --- a/internal/dao/user.go +++ b/internal/dao/user.go @@ -62,14 +62,14 @@ func (d *dataServant) GetUsersByIDs(ids []int64) ([]*model.User, error) { func (d *dataServant) GetUsersByKeyword(keyword string) ([]*model.User, error) { user := &model.User{} - if strings.Trim(keyword, " ") == "" { + keyword = strings.Trim(keyword, " ") + "%" + if keyword == "%" { return user.List(d.engine, &model.ConditionsT{ "ORDER": "id ASC", }, 0, 6) } else { - return user.List(d.engine, &model.ConditionsT{ - "username LIKE ?": strings.Trim(keyword, " ") + "%", + "username LIKE ?": keyword, }, 0, 6) } } @@ -78,14 +78,14 @@ func (d *dataServant) GetUsersByKeyword(keyword string) ([]*model.User, error) { func (d *dataServant) GetTagsByKeyword(keyword string) ([]*model.Tag, error) { tag := &model.Tag{} - if strings.Trim(keyword, " ") == "" { + keyword = "%" + strings.Trim(keyword, " ") + "%" + if keyword == "%%" { return tag.List(d.engine, &model.ConditionsT{ "ORDER": "quote_num DESC", }, 0, 6) } else { - return tag.List(d.engine, &model.ConditionsT{ - "tag LIKE ?": "%" + strings.Trim(keyword, " ") + "%", + "tag LIKE ?": keyword, "ORDER": "quote_num DESC", }, 0, 6) }