|
@@ -209,7 +209,7 @@ func (this *SysUserController) Edit() {
|
|
|
this.ServeJSON()
|
|
|
}()
|
|
|
|
|
|
- var req request.SysUserInfoReq
|
|
|
+ var req request.EditReq
|
|
|
err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
|
|
|
if err != nil {
|
|
|
br.Msg = "参数解析异常!"
|
|
@@ -251,26 +251,26 @@ func (this *SysUserController) Edit() {
|
|
|
br.Msg = "账号名称已存在,请重新输入"
|
|
|
return
|
|
|
}
|
|
|
- req.Phone = strings.TrimSpace(req.Phone)
|
|
|
- req.Email = strings.TrimSpace(req.Email)
|
|
|
- if req.Phone == "" && req.Email == "" {
|
|
|
- br.Msg = "至少输入一个手机号或邮箱"
|
|
|
- return
|
|
|
- }
|
|
|
- if req.Phone != "" {
|
|
|
- if req.AreaCode == "86" {
|
|
|
- if !utils.ValidateMobileFormatat(req.Phone) {
|
|
|
- br.Msg = "手机号格式有误, 请检查"
|
|
|
- return
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- if req.Email != "" {
|
|
|
- if !utils.ValidateEmailFormatat(req.Email) {
|
|
|
- br.Msg = "邮箱格式有误, 请检查"
|
|
|
- return
|
|
|
- }
|
|
|
- }
|
|
|
+ //req.Phone = strings.TrimSpace(req.Phone)
|
|
|
+ //req.Email = strings.TrimSpace(req.Email)
|
|
|
+ //if req.Phone == "" && req.Email == "" {
|
|
|
+ // br.Msg = "至少输入一个手机号或邮箱"
|
|
|
+ // return
|
|
|
+ //}
|
|
|
+ //if req.Phone != "" {
|
|
|
+ // if req.AreaCode == "86" {
|
|
|
+ // if !utils.ValidateMobileFormatat(req.Phone) {
|
|
|
+ // br.Msg = "手机号格式有误, 请检查"
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ //}
|
|
|
+ //if req.Email != "" {
|
|
|
+ // if !utils.ValidateEmailFormatat(req.Email) {
|
|
|
+ // br.Msg = "邮箱格式有误, 请检查"
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ //}
|
|
|
|
|
|
var roleName string
|
|
|
roleItem, err := models.GetSysRoleById(req.SysRoleId)
|
|
@@ -289,15 +289,15 @@ func (this *SysUserController) Edit() {
|
|
|
}
|
|
|
|
|
|
sysUser.SysUserName = req.SysUserName
|
|
|
- sysUser.SysRealName = req.RealName
|
|
|
- sysUser.AreaCode = req.AreaCode
|
|
|
- sysUser.Phone = req.Phone
|
|
|
- sysUser.Email = req.Email
|
|
|
+ //sysUser.SysRealName = req.RealName
|
|
|
+ //sysUser.AreaCode = req.AreaCode
|
|
|
+ //sysUser.Phone = req.Phone
|
|
|
+ //sysUser.Email = req.Email
|
|
|
sysUser.SysRoleId = req.SysRoleId
|
|
|
sysUser.SysRoleName = roleName
|
|
|
- sysUser.Province = req.Province
|
|
|
- sysUser.City = req.City
|
|
|
- sysUser.IsEnabled = req.IsEnabled
|
|
|
+ //sysUser.Province = req.Province
|
|
|
+ //sysUser.City = req.City
|
|
|
+ //sysUser.IsEnabled = req.IsEnabled
|
|
|
sysUser.ModifyTime = time.Now()
|
|
|
err = sysUser.Save()
|
|
|
if err != nil {
|