oadmin/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: remove redundant group column handling in user queries

Browse Source
This commit is contained in:
CalciumIon
2024-12-29 17:02:30 +08:00
parent ed435e5c8f
commit ca8b7ed1c3
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
model/user.go
View File

@@ -90,11 +90,6 @@ func SearchUsers(keyword string, group string) ([]*User, error) {
var users []*User var users []*User
var err error var err error
groupCol := "`group`"
if common.UsingPostgreSQL {
groupCol = `"group"`
}
// 尝试将关键字转换为整数ID // 尝试将关键字转换为整数ID
keywordInt, err := strconv.Atoi(keyword) keywordInt, err := strconv.Atoi(keyword)
if err == nil { if err == nil {
@@ -513,11 +508,6 @@ func GetUserGroup(id int, fromDB bool) (group string, err error) {
// Don't return error - fall through to DB // Don't return error - fall through to DB
} }
groupCol := "`group`"
if common.UsingPostgreSQL {
groupCol = `"group"`
}
err = DB.Model(&User{}).Where("id = ?", id).Select(groupCol).Find(&group).Error err = DB.Model(&User{}).Where("id = ?", id).Select(groupCol).Find(&group).Error
if err != nil { if err != nil {
return "", err return "", err