diff --git a/dao/user.go b/dao/user.go index 9ad64e5..0db94c5 100644 --- a/dao/user.go +++ b/dao/user.go @@ -28,8 +28,8 @@ func DeleteUserByID(id int) int { return id } -func FindUserByID(id int) []proto.SearchUser { - var users []proto.SearchUser +func FindUserByID(id int) []proto.User { + var users []proto.User DB.Debug().Where("id = ?", id).First(&users) return users } @@ -42,8 +42,8 @@ func FindUserByName(name string) User { } // 根据name模糊查询,邮箱也是,不查询密码 -func FindUserByNameLike(name string) []proto.SearchUser { - var users []proto.SearchUser +func FindUserByNameLike(name string) []proto.User { + var users []proto.User DB.Debug().Where("name LIKE ? OR email LIKE ?", "%"+name+"%", "%"+name+"%").Find(&users) return users } diff --git a/handler/user.go b/handler/user.go index 85ce386..b761aac 100644 --- a/handler/user.go +++ b/handler/user.go @@ -185,9 +185,11 @@ func SearchHandler(c *gin.Context) { if req_data.ID != -1 { user := service.GetUserByID(req_data.ID) c.JSON(200, gin.H{"code": proto.SuccessCode, "message": "success", "data": user}) + return } else if req_data.Keyword != "" { users := service.GetUserByNameLike(req_data.Keyword) c.JSON(200, gin.H{"code": proto.SuccessCode, "message": "success", "data": users}) + return } else { c.JSON(200, gin.H{"code": proto.ParameterError, "message": "error", "data": "无ID 与 关键字"}) } diff --git a/proto/conf.go b/proto/conf.go index 87fe5f4..f27810c 100644 --- a/proto/conf.go +++ b/proto/conf.go @@ -17,7 +17,7 @@ const ( TOKEN_SECRET = "mfjurnc_32ndj9dfhj" ) -type SearchUser struct { +type User struct { gorm.Model Name string `gorm:"column:name"` Age int `gorm:"column:age"` diff --git a/service/userService.go b/service/userService.go index b0fd2fa..8dd86cd 100644 --- a/service/userService.go +++ b/service/userService.go @@ -34,10 +34,10 @@ func ContainsUser(name, email string) bool { return false } -func GetUserByID(id int) []proto.SearchUser { +func GetUserByID(id int) []proto.User { return dao.FindUserByID(id) } -func GetUserByNameLike(name string) []proto.SearchUser { +func GetUserByNameLike(name string) []proto.User { return dao.FindUserByNameLike(name) }