From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index f05f7a8..52c9991
--- a/java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml
@@ -76,14 +76,21 @@
<!-- 鏌ヨ缁勭粐鍛樺伐鍏崇郴淇℃伅 add by wuxw 2018-07-03 -->
<select id="getOrgStaffRelInfo" parameterType="Map" resultType="Map">
select t.rel_id,t.rel_id relId,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId,t.b_id,t.b_id
- bId,t.org_id,t.org_id orgId,t.staff_id,t.staff_id staffId,t.rel_cd,t.rel_cd relCd
+ bId,t.org_id,t.org_id orgId,t.staff_id,t.staff_id staffId,t.rel_cd,t.rel_cd relCd,uo.parent_org_id parentOrgId,
+ uu.name staffName,uo.org_name departmentName,uo.org_id departmentId,td.`name` relCdName
from u_org_staff_rel t
- where 1 =1
+ inner join u_org uo on t.org_id = uo.org_id and uo.status_cd = '0'
+ inner join u_user uu on t.staff_id = uu.user_id
+ left join t_dict td on t.rel_cd = td.status_cd and td.table_name = 'u_org_staff_rel' and td.table_columns = 'rel_cd'
+ where 1=1
+
+ <if test='statusCd ==null or statusCd != "1"'>
+ and uu.status_cd = '0'
+ and uo.status_cd = '0'
+ and t.status_cd= '0'
+ </if>
<if test="relId !=null and relId != ''">
and t.rel_id= #{relId}
- </if>
- <if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
</if>
<if test="storeId !=null and storeId != ''">
and t.store_id= #{storeId}
@@ -138,8 +145,9 @@
<!-- 鏌ヨ缁勭粐鍛樺伐鍏崇郴鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryOrgStaffRelsCount" parameterType="Map" resultType="Map">
select count(1) count
- from u_org_staff_rel t
- where 1 =1
+ from u_org_staff_rel t,u_org uo
+ where t.org_id = uo.org_id
+ and uo.status_cd = '0'
<if test="relId !=null and relId != ''">
and t.rel_id= #{relId}
</if>
@@ -165,4 +173,25 @@
</select>
+ <!-- 鏍规嵁鍛樺伐ID鏌ヨ閮ㄩ棬锛屽叕鍙镐俊鎭� add by zc 2020-02-17 -->
+ <select id="queryOrgInfoByStaffIds" parameterType="Map" resultType="Map">
+ select
+ t.rel_id relId,t.org_id departmentId,t.staff_id staffId,t.store_id storeId,u.org_name departmentName,
+ u.parent_org_id companyId,o.org_name companyName,o.org_id companyId
+ from
+ u_org_staff_rel t
+ inner join u_org u on t.org_id = u.org_id
+ inner join u_org o on u.parent_org_id = o.org_id
+ WHERE 1 = 1
+ <if test="staffIds !=null">
+ and t.staff_id in
+ <foreach collection="staffIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="staffId !=null and staffId !=''">
+ and t.staff_id =#{staffId}
+ </if>
+ </select>
+
</mapper>
--
Gitblit v1.8.0