Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release

This commit is contained in:
skiffer-git
2022-09-20 09:23:42 +08:00
8 changed files with 452 additions and 209 deletions
@@ -257,6 +257,22 @@ func GetUsersByNameAndID(content string, showNumber, pageNumber int32) ([]db.Use
return users, count, err
}
func GetUserIDsByEmailAndID(phoneNumber, email string) ([]string, error) {
db := db.DB.MysqlDB.DefaultGormDB().Table("users")
if phoneNumber == "" && email == "" {
return nil, nil
}
if phoneNumber != "" {
db = db.Where("phone_number = ? ", phoneNumber)
}
if email != "" {
db = db.Where("email = ? ", email)
}
var userIDList []string
err := db.Pluck("user_id", &userIDList).Error
return userIDList, err
}
func GetUsersCount(userName string) (int32, error) {
var count int64
if err := db.DB.MysqlDB.DefaultGormDB().Table("users").Where(" name like ? ", fmt.Sprintf("%%%s%%", userName)).Count(&count).Error; err != nil {