diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java index 6aa5c72529..dc0ea1d6e8 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java @@ -187,5 +187,5 @@ public interface SysUserMapper extends BaseMapper { int updateAppIdNull(String appId); - SysUserVo fetchByUserNameAndUserPhone(@Param("userName") String userName,@Param("userPhone") String userPhone); + String fetchByUserNameAndUserPhone(@Param("userName") String userName,@Param("userPhone") String userPhone); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml index cc121aa2dc..3fe1e64f98 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml @@ -356,10 +356,12 @@ and userType = 1 - + SELECT su.`sid` + FROM sys_user su + LEFT JOIN sys_staffinfo ss + ON su.`staffSid` = ss.`sid` + WHERE ss.name = #{userName} + AND su.mobile = #{userPhone} \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index faaea12589..2a483270da 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -943,15 +943,15 @@ public class SysUserService extends MybatisBaseService { public ResultBean reGetPwd(String userName, String userPhone) { ResultBean rb = ResultBean.fireFail(); - SysUserVo sysUserVo = baseMapper.fetchByUserNameAndUserPhone(userName, userPhone); - if (sysUserVo != null){ - Boolean aBoolean = initPwd(sysUserVo.getSid()); + String userSid = baseMapper.fetchByUserNameAndUserPhone(userName, userPhone); + if (StringUtils.isNotBlank(userSid)){ + Boolean aBoolean = initPwd(userSid); if (!aBoolean) { return ResultBean.fireFail().setMsg("初始化密码失败"); } return ResultBean.fireSuccess().setMsg("初始化密码成功"); } - return rb.setMsg("用户名或手机号填写不正确"); + return rb.setMsg("姓名或手机号填写不正确"); } public int updateIsEnable(String sid, String isEnable) {