From d737a229856becf58cbc7b61b34426caf9056553 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 25 Apr 2023 15:27:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml
index 7bca0b4..09d948f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml
@@ -78,4 +78,11 @@
         where D.AD_CODE = #{user.adCode} and U.ROLE_ID like CONCAT('%',(select id from BLADE_ROLE where ROLE_ALIAS = 'qxgly'),'%')
     </select>
 
+    <!--根据手机号码或者账户查询用户信息-->
+    <select id="selectUserByPhoneOrAccount" resultType="cn.gistack.system.user.entity.User">
+        select * from BLADE_USER where is_deleted = 0
+        and TENANT_ID = #{tenantId}
+        and (ACCOUNT = #{key} or PHONE = #{key})
+    </select>
+
 </mapper>

--
Gitblit v1.9.3