From 4d5d875521945f7b0c9c45dac1ec5b8694e23728 Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Fri, 19 Mar 2021 15:15:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=BB=91=E5=AE=9A=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E7=94=A8=E6=88=B7=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/hrauth/UserLoginMapper.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/UserLoginMapper.xml b/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/UserLoginMapper.xml
index eee85a81..7398db3b 100644
--- a/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/UserLoginMapper.xml
+++ b/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/UserLoginMapper.xml
@@ -25,13 +25,15 @@
     </select>
 
     <select id="login" parameterType="com.daqing.framework.domain.hrms.request.LoginRequest" resultType="com.daqing.framework.domain.hrms.UserEntity">
-        select id,account,phone_account,password,login_num,head_portarit_url from hrms_user
-        where del_or_not = 0 and status = 0
+        select hu.id,hu.account,hu.phone_account,hu.password,hu.login_num,hu.head_portarit_url
+        from hrms_user hu
+        INNER JOIN hrms_employee he ON he.user_id=hu.id
+        where hu.del_or_not = 0 and hu.status = 0
         <if test="phone != null and phone != '' ">
-            and (phone_account = #{phone} or account = #{phone})
+            and (hu.phone_account = #{phone} or hu.account = #{phone})
         </if>
         <if test="wechatId != null and wechatId != '' ">
-            and wechat_id = #{wechatId}
+            and hu.wechat_id = #{wechatId}
         </if>
 
     </select>
@@ -39,7 +41,7 @@
         SELECT id,account,password FROM hrms_user WHERE phone_account = #{phoneAccount}
     </select>
     <select id="findByOpenid" parameterType="string" resultType="com.daqing.framework.domain.hrms.UserEntity">
-        select id,phone_account from hrms_user where wechat_id = #{openId}
+        SELECT hu.id,hu.phone_account FROM hrms_user hu INNER JOIN hrms_employee he ON he.user_id=hu.id WHERE hu.wechat_id = #{openId}
     </select>
 
     <update id="updateOpenIdByPhoneAccount">