HI-VPN/hi-server
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: Account display priority: phone number > email > device ID

Browse Source
This commit is contained in:
EUForest 2025-11-08 17:05:05 +08:00
parent d1a8662095
commit b7eafd0892
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/model/user/model.go
View File

@ -148,7 +148,7 @@ func (m *customUserModel) QueryPageList(ctx context.Context, page, size int, fil
conn = conn.Order(fmt.Sprintf("user.id %s", filter.Order)) conn = conn.Order(fmt.Sprintf("user.id %s", filter.Order))
} }
} }
return conn.Model(&User{}).Group("user.id").Count(&total).Limit(size).Offset((page - 1) * size).Preload("UserDevices").Preload("AuthMethods").Find(&list).Error return conn.Model(&User{}).Group("user.id").Count(&total).Limit(size).Offset((page-1)*size).Preload("UserDevices").Preload("AuthMethods", func(db *gorm.DB) *gorm.DB { return db.Order("user_auth_methods.auth_type desc") }).Find(&list).Error
}) })
return list, total, err return list, total, err
} }
@ -225,7 +225,7 @@ func (m *customUserModel) QueryResisterUserTotal(ctx context.Context) (int64, er
func (m *customUserModel) QueryAdminUsers(ctx context.Context) ([]*User, error) { func (m *customUserModel) QueryAdminUsers(ctx context.Context) ([]*User, error) {
var data []*User var data []*User
err := m.QueryNoCacheCtx(ctx, &data, func(conn *gorm.DB, v interface{}) error { err := m.QueryNoCacheCtx(ctx, &data, func(conn *gorm.DB, v interface{}) error {
return conn.Model(&User{}).Preload("AuthMethods").Where("is_admin = ?", true).Find(&data).Error return conn.Model(&User{}).Preload("AuthMethods", func(db *gorm.DB) *gorm.DB { return db.Order("user_auth_methods.auth_type desc") }).Where("is_admin = ?", true).Find(&data).Error
}) })
return data, err return data, err
} }