From 48c9414db4b7c44a43524115570796025d38a653 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 17 一月 2022 16:37:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/user/UserLoginServiceDaoImplMapper.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/UserLoginServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/UserLoginServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 154e3cc..b6a6f21
--- a/java110-db/src/main/resources/mapper/user/UserLoginServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/UserLoginServiceDaoImplMapper.xml
@@ -17,10 +17,20 @@
<!-- 鏌ヨ鐢ㄦ埛鐧诲綍淇℃伅 add by wuxw 2018-07-03 -->
<select id="getUserLoginInfo" parameterType="Map" resultType="Map">
- select t.password,t.login_id,t.login_id loginId,t.login_time,t.login_time
- loginTime,t.source,t.user_name,t.user_name userName,t.user_id,t.user_id userId,t.token
+ select DISTINCT t.login_id,t.login_id loginId,t.login_time,t.login_time
+ loginTime,t.source,t.user_name,t.user_name userName,t.user_id,t.user_id userId,
+ puo.org_name parentOrgName,uo.org_name orgName
from u_user_login t
+ left join u_org_staff_rel uosr on t.user_id = uosr.staff_id and uosr.status_cd = '0'
+ left join u_org uo on uosr.org_id = uo.org_id and uo.status_cd = '0'
+ left join u_org puo on uo.parent_org_id = puo.org_id and puo.status_cd = '0'
where 1 =1
+ <if test="parentOrgName !=null and parentOrgName != ''">
+ and puo.org_name= #{parentOrgName}
+ </if>
+ <if test="orgName !=null and orgName != ''">
+ and uo.org_name= #{orgName}
+ </if>
<if test="password !=null and password != ''">
and t.password= #{password}
</if>
--
Gitblit v1.8.0