From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/user/UserLoginServiceDaoImplMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 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 d6526f1..b6a6f21
--- a/java110-db/src/main/resources/mapper/user/UserLoginServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/UserLoginServiceDaoImplMapper.xml
@@ -17,9 +17,9 @@
 
     <!-- 鏌ヨ鐢ㄦ埛鐧诲綍淇℃伅 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,
-        puo.org_id parentOrgId,puo.org_name parentOrgName,uo.org_name orgName
+        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'

--
Gitblit v1.8.0