🎨 优化用户登录接口&优化登录日志接口
This commit is contained in:
@@ -297,7 +297,7 @@ func (u *UserService) SetUserVip(p request.SetUserVipReq) error {
|
||||
}
|
||||
|
||||
// GetLoginLog 获取登录日志
|
||||
func (u *UserService) GetLoginLog(p request.GetUserListReq) (list []user.LoginLog, total int64, err error) {
|
||||
func (u *UserService) GetLoginLog(p request.GetUserLoginLog) (list []user.LoginLog, total int64, err error) {
|
||||
limit := p.PageSize
|
||||
offset := (p.Page - 1) * p.PageSize
|
||||
db := global.GVA_DB.Model(&user.LoginLog{})
|
||||
@@ -305,8 +305,12 @@ func (u *UserService) GetLoginLog(p request.GetUserListReq) (list []user.LoginLo
|
||||
if p.UserId != 0 {
|
||||
db = db.Where("user_id = ?", p.UserId)
|
||||
}
|
||||
if p.Name != "" {
|
||||
db = db.Where("user_name LIKE ?", "%"+p.Name+"%")
|
||||
if p.UserName != "" {
|
||||
db = db.Where("user_name LIKE ?", "%"+p.UserName+"%")
|
||||
}
|
||||
|
||||
if p.Ip != "" {
|
||||
db = db.Where("ip LIKE ?", "%"+p.Ip+"%")
|
||||
}
|
||||
err = db.Count(&total).Error
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user