|
|
|
@ -234,20 +234,37 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> { |
|
|
|
return baseMapper.updatePassword(sid, password); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean updatePasswordApp(SysUser user, String oldPassword, String newPassword, String token) { |
|
|
|
public ResultBean<SysUserVo> updatePasswordApp(SysUser user, String oldPassword, String newPassword, String token) { |
|
|
|
ResultBean<SysUserVo> rb = ResultBean.fireFail(); |
|
|
|
String oldPasswordMd5 = Encodes.md5(oldPassword); |
|
|
|
if (!oldPasswordMd5.equals(user.getPassword())) { |
|
|
|
return ResultBean.fireFail().setMsg("原始密码输入错误"); |
|
|
|
return rb.setMsg("原始密码输入错误"); |
|
|
|
} |
|
|
|
if (!newPassword.matches("^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[a-zA-Z0-9]{8,10}$")) { |
|
|
|
return ResultBean.fireFail().setMsg("密码格式错误，必须为8至10位大小写字母和数字的组合"); |
|
|
|
return rb.setMsg("密码格式错误，必须为8至10位大小写字母和数字的组合"); |
|
|
|
} |
|
|
|
int i = baseMapper.updatePasswordApp(user.getSid(), Encodes.md5(newPassword)); |
|
|
|
SysUserVo sysUserVo = selectUserOne(user); |
|
|
|
if (sysUserVo == null) { |
|
|
|
sysUserVo = new SysUserVo(); |
|
|
|
} else { |
|
|
|
//查询是否需要更换密码
|
|
|
|
boolean isTrue = false; |
|
|
|
String mobile = user.getMobile(); |
|
|
|
if (StringUtils.isNotBlank(mobile)) { |
|
|
|
String password = mobile.substring(5, 11); |
|
|
|
String md5 = Encodes.md5(password); |
|
|
|
if (user.getPassword().equals(md5)) { |
|
|
|
isTrue = true; |
|
|
|
} |
|
|
|
} |
|
|
|
sysUserVo.setNeedResetPsd(isTrue); |
|
|
|
} |
|
|
|
if (i == 1) { |
|
|
|
redisUtil.remove(token); |
|
|
|
return ResultBean.fireSuccess().setMsg("修改成功"); |
|
|
|
return rb.success().setData(sysUserVo); |
|
|
|
} else { |
|
|
|
return ResultBean.fireSuccess().setMsg("修改失败"); |
|
|
|
return rb.setMsg("修改失败"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -338,7 +355,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> { |
|
|
|
userInfoOneVo.setDepartmentName(sysStaffOrgVo.getOrgName()); |
|
|
|
userInfoOneVo.setDepartmentSid(sysStaffOrgVo.getOrgSid()); |
|
|
|
SysOrganization sysOrganizationOne = sysOrganizationService.fetchBySid(sysStaffOrgVo.getOrgSid()); |
|
|
|
if(sysOrganizationOne != null){ |
|
|
|
if (sysOrganizationOne != null) { |
|
|
|
String psid = sysOrganizationOne.getPsid(); |
|
|
|
String name = sysOrganizationService.fetchBySid(psid).getName(); |
|
|
|
userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName()); |
|
|
|
@ -407,6 +424,17 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> { |
|
|
|
sysUserVo.setToken(newToken); |
|
|
|
// 更新用户中的token
|
|
|
|
updateToken(user.getSid(), newToken); |
|
|
|
//查询是否需要更换密码
|
|
|
|
boolean isTrue = false; |
|
|
|
String mobile = user.getMobile(); |
|
|
|
if (StringUtils.isNotBlank(mobile)) { |
|
|
|
String password = mobile.substring(5, 11); |
|
|
|
String md5 = Encodes.md5(password); |
|
|
|
if (user.getPassword().equals(md5)) { |
|
|
|
isTrue = true; |
|
|
|
} |
|
|
|
} |
|
|
|
sysUserVo.setNeedResetPsd(isTrue); |
|
|
|
return sysUserVo; |
|
|
|
} |
|
|
|
|
|
|
|
|
