From db82a420c01f1a9c2c0f8910a23f757cb5a4f54f Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 10 Jan 2023 17:46:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/anrui/portal/biz/sysuser/SysUserMapper.java  |  2 +-
 .../yxt/anrui/portal/biz/sysuser/SysUserMapper.xml   | 12 +++++++-----
 .../yxt/anrui/portal/biz/sysuser/SysUserService.java |  8 ++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

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<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);
 }
\ 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
     </update>
 
-    <select id="fetchByUserNameAndUserPhone" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
-        SELECT *
-        FROM sys_user
-        WHERE userName = #{userName}
-          AND mobile = #{userPhone}
+    <select id="fetchByUserNameAndUserPhone" resultType="java.lang.String">
+        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}
     </select>
 </mapper>
\ 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<SysUserMapper, SysUser> {
 
     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) {