fix: 用户手机邮箱备注允许置空

This commit is contained in:
TsMask
2023-10-30 18:18:05 +08:00
parent 08a74268ac
commit fd60092f78
4 changed files with 7 additions and 30 deletions

View File

@@ -120,8 +120,6 @@ func (s *SysProfileController) UpdateProfile(c *gin.Context) {
c.JSON(200, result.ErrMsg(msg)) c.JSON(200, result.ErrMsg(msg))
return return
} }
} else {
body.PhoneNumber = "nil"
} }
// 检查邮箱格式并判断是否唯一 // 检查邮箱格式并判断是否唯一
@@ -138,8 +136,6 @@ func (s *SysProfileController) UpdateProfile(c *gin.Context) {
c.JSON(200, result.ErrMsg(msg)) c.JSON(200, result.ErrMsg(msg))
return return
} }
} else {
body.Email = "nil"
} }
// 用户基本资料 // 用户基本资料

View File

@@ -387,9 +387,7 @@ func (r *SysMenuImpl) UpdateMenu(sysMenu model.SysMenu) int64 {
} else { } else {
params["icon"] = "#" params["icon"] = "#"
} }
if sysMenu.Remark != "" { params["remark"] = sysMenu.Remark
params["remark"] = sysMenu.Remark
}
if sysMenu.UpdateBy != "" { if sysMenu.UpdateBy != "" {
params["update_by"] = sysMenu.UpdateBy params["update_by"] = sysMenu.UpdateBy
params["update_time"] = time.Now().UnixMilli() params["update_time"] = time.Now().UnixMilli()

View File

@@ -248,9 +248,7 @@ func (r *SysRoleImpl) UpdateRole(sysRole model.SysRole) int64 {
if sysRole.Status != "" { if sysRole.Status != "" {
params["status"] = sysRole.Status params["status"] = sysRole.Status
} }
if sysRole.Remark != "" { params["remark"] = sysRole.Remark
params["remark"] = sysRole.Remark
}
if sysRole.UpdateBy != "" { if sysRole.UpdateBy != "" {
params["update_by"] = sysRole.UpdateBy params["update_by"] = sysRole.UpdateBy
params["update_time"] = time.Now().UnixMilli() params["update_time"] = time.Now().UnixMilli()

View File

@@ -476,23 +476,10 @@ func (r *SysUserImpl) UpdateUser(sysUser model.SysUser) int64 {
if sysUser.Avatar != "" { if sysUser.Avatar != "" {
params["avatar"] = sysUser.Avatar params["avatar"] = sysUser.Avatar
} }
if sysUser.Email != "" {
if sysUser.Email == "nil" { params["email"] = sysUser.Email
params["email"] = "" params["phonenumber"] = sysUser.PhoneNumber
} else { params["sex"] = sysUser.Sex
params["email"] = sysUser.Email
}
}
if sysUser.PhoneNumber != "" {
if sysUser.PhoneNumber == "nil" {
params["phonenumber"] = ""
} else {
params["phonenumber"] = sysUser.PhoneNumber
}
}
if sysUser.Sex != "" {
params["sex"] = sysUser.Sex
}
if sysUser.Password != "" { if sysUser.Password != "" {
password := crypto.BcryptHash(sysUser.Password) password := crypto.BcryptHash(sysUser.Password)
params["password"] = password params["password"] = password
@@ -500,9 +487,7 @@ func (r *SysUserImpl) UpdateUser(sysUser model.SysUser) int64 {
if sysUser.Status != "" { if sysUser.Status != "" {
params["status"] = sysUser.Status params["status"] = sysUser.Status
} }
if sysUser.Remark != "" { params["remark"] = sysUser.Remark
params["remark"] = sysUser.Remark
}
if sysUser.UpdateBy != "" { if sysUser.UpdateBy != "" {
params["update_by"] = sysUser.UpdateBy params["update_by"] = sysUser.UpdateBy
params["update_time"] = time.Now().UnixMilli() params["update_time"] = time.Now().UnixMilli()