问题修改

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<SysUser> {
 
     int updateAppIdNull(String appId);
 
-    SysUserVo fetchByUserNameAndUserPhone(@Param("userName") String userName,@Param("userPhone") String userPhone);
+    String fetchByUserNameAndUserPhone(@Param("userName") String userName,@Param("userPhone") String userPhone);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml

@@ -356,10 +356,12 @@
           and userType = 1
     </update>
 
-    <select id="fetchByUserNameAndUserPhone" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
+    <select id="fetchByUserNameAndUserPhone" resultType="java.lang.String">
-        SELECT *
+        SELECT su.`sid`
-        FROM sys_user
+        FROM sys_user su
-        WHERE userName = #{userName}
+                     LEFT JOIN sys_staffinfo ss
-          AND mobile = #{userPhone}
+                ON su.`staffSid` = ss.`sid`
+        WHERE ss.name = #{userName}
+          AND su.mobile = #{userPhone}
     </select>
 </mapper>

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<SysUserMapper, SysUser> {
 
     public ResultBean reGetPwd(String userName, String userPhone) {
         ResultBean rb = ResultBean.fireFail();
-        SysUserVo sysUserVo = baseMapper.fetchByUserNameAndUserPhone(userName, userPhone);
+        String userSid = baseMapper.fetchByUserNameAndUserPhone(userName, userPhone);
-        if (sysUserVo != null){
+        if (StringUtils.isNotBlank(userSid)){
-            Boolean aBoolean = initPwd(sysUserVo.getSid());
+            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) {