From 06672d5ff993d43188e0317d0d6540ec450d318f Mon Sep 17 00:00:00 2001 From: Ulric Qin Date: Fri, 22 Apr 2022 22:18:58 +0800 Subject: [PATCH] fix user group search --- src/models/user.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/models/user.go b/src/models/user.go index ecb7c137..6cca7efb 100644 --- a/src/models/user.go +++ b/src/models/user.go @@ -484,12 +484,12 @@ func (u *User) UserGroups(limit int, query string) ([]UserGroup, error) { return nil, errors.WithMessage(err, "failed to get MyGroupIds") } - session = session.Where("create_by = ? and name like ?", u.Username, "%"+query+"%") - if len(ids) > 0 { - session = session.Or("id in ?", ids) + session = session.Where("id in ? or create_by = ?", ids, u.Username) + } else { + session = session.Where("create_by = ?", u.Username) } - err = session.Find(&lst).Error + err = session.Where("name like ?", "%"+query+"%").Find(&lst).Error return lst, err }