修复查询用户错误

This commit is contained in:
junleea 2024-06-28 10:38:55 +08:00
parent e624700924
commit 372b3127b5
4 changed files with 9 additions and 7 deletions

View File

@ -28,8 +28,8 @@ func DeleteUserByID(id int) int {
return id return id
} }
func FindUserByID(id int) []proto.SearchUser { func FindUserByID(id int) []proto.User {
var users []proto.SearchUser var users []proto.User
DB.Debug().Where("id = ?", id).First(&users) DB.Debug().Where("id = ?", id).First(&users)
return users return users
} }
@ -42,8 +42,8 @@ func FindUserByName(name string) User {
} }
// 根据name模糊查询邮箱也是,不查询密码 // 根据name模糊查询邮箱也是,不查询密码
func FindUserByNameLike(name string) []proto.SearchUser { func FindUserByNameLike(name string) []proto.User {
var users []proto.SearchUser var users []proto.User
DB.Debug().Where("name LIKE ? OR email LIKE ?", "%"+name+"%", "%"+name+"%").Find(&users) DB.Debug().Where("name LIKE ? OR email LIKE ?", "%"+name+"%", "%"+name+"%").Find(&users)
return users return users
} }

View File

@ -185,9 +185,11 @@ func SearchHandler(c *gin.Context) {
if req_data.ID != -1 { if req_data.ID != -1 {
user := service.GetUserByID(req_data.ID) user := service.GetUserByID(req_data.ID)
c.JSON(200, gin.H{"code": proto.SuccessCode, "message": "success", "data": user}) c.JSON(200, gin.H{"code": proto.SuccessCode, "message": "success", "data": user})
return
} else if req_data.Keyword != "" { } else if req_data.Keyword != "" {
users := service.GetUserByNameLike(req_data.Keyword) users := service.GetUserByNameLike(req_data.Keyword)
c.JSON(200, gin.H{"code": proto.SuccessCode, "message": "success", "data": users}) c.JSON(200, gin.H{"code": proto.SuccessCode, "message": "success", "data": users})
return
} else { } else {
c.JSON(200, gin.H{"code": proto.ParameterError, "message": "error", "data": "无ID 与 关键字"}) c.JSON(200, gin.H{"code": proto.ParameterError, "message": "error", "data": "无ID 与 关键字"})
} }

View File

@ -17,7 +17,7 @@ const (
TOKEN_SECRET = "mfjurnc_32ndj9dfhj" TOKEN_SECRET = "mfjurnc_32ndj9dfhj"
) )
type SearchUser struct { type User struct {
gorm.Model gorm.Model
Name string `gorm:"column:name"` Name string `gorm:"column:name"`
Age int `gorm:"column:age"` Age int `gorm:"column:age"`

View File

@ -34,10 +34,10 @@ func ContainsUser(name, email string) bool {
return false return false
} }
func GetUserByID(id int) []proto.SearchUser { func GetUserByID(id int) []proto.User {
return dao.FindUserByID(id) return dao.FindUserByID(id)
} }
func GetUserByNameLike(name string) []proto.SearchUser { func GetUserByNameLike(name string) []proto.User {
return dao.FindUserByNameLike(name) return dao.FindUserByNameLike(name)
} }