From 3f4948a093237990407b4deaa77506c720dbb859 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 18 五月 2020 15:27:16 +0800
Subject: [PATCH] Merge branch 'back' of https://github.com/java110/MicroCommunity into back
---
java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml
index 0549036..b8d430c 100644
--- a/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml
@@ -440,16 +440,19 @@
u_user a
,u_org uo
,u_org_staff_rel uosr
+ ,u_org puo
where a.level_cd = '01'
and a.user_id = uosr.staff_id
and uosr.store_id = #{storeId}
and uosr.org_id = uo.org_id
+ and uo.parent_org_id = puo.org_id
<if test="parentOrgId !=null and parentOrgId != ''">
and uo.parent_org_id = #{parentOrgId}
</if>
and a.status_cd = '0'
and uo.status_cd = '0'
and uosr.status_cd = '0'
+ and puo.status_cd = '0'
<if test="tel !=null and tel != ''">
and a.tel= #{tel}
</if>
@@ -469,22 +472,25 @@
<!-- 鏌ヨ鍛樺伐鎬婚噺 -->
<select id="getStaffs" parameterType="Map" resultType="Map">
- select uo.org_name,uo.org_name orgName,u.user_id, u.user_id userId,u.name,u.name userName,u.email,u.address,u.location_cd,u.location_cd locationCd,
- u.age,u.sex,u.tel,u.level_cd,u.b_id
+ select uo.org_id orgId,uo.org_name,uo.org_name orgName,u.user_id, u.user_id userId,u.name,u.name userName,u.email,u.address,u.location_cd,u.location_cd locationCd,
+ u.age,u.sex,u.tel,u.level_cd,u.b_id,puo.org_id parentOrgId,puo.org_name parentOrgName
from
u_user u
,u_org uo
,u_org_staff_rel uosr
+ ,u_org puo
where u.level_cd = '01'
and u.user_id = uosr.staff_id
and uosr.store_id = #{storeId}
and uosr.org_id = uo.org_id
+ and uo.parent_org_id = puo.org_id
<if test="parentOrgId !=null and parentOrgId != ''">
and uo.parent_org_id = #{parentOrgId}
</if>
and u.status_cd = '0'
and uo.status_cd = '0'
and uosr.status_cd = '0'
+ and puo.status_cd = '0'
<if test="tel !=null and tel != ''">
and u.tel= #{tel}
</if>
@@ -576,7 +582,7 @@
<!-- 鏌ヨ鐢ㄦ埛瀵嗙爜 -->
<select id="getUserHasPwd" parameterType="Map" resultType="Map">
select u.user_id, u.user_id userId,u.name,u.name userName,u.email,u.address,u.password,u.location_cd,u.location_cd locationCd,
- u.age,u.sex,u.tel,u.level_cd,u.b_id,u.password
+ u.age,u.sex,u.tel,u.level_cd levelCd,u.b_id,u.password
from u_user u
<if test="openId != null and openId !=''">
,u_user_attr ua
--
Gitblit v1.8.0