From bd59c19c6fccfc8d0bf3804c0d0c712454bd7d42 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 16 六月 2021 17:24:47 +0800
Subject: [PATCH] 修复扣款
---
java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 ce0392a..52c9991
--- a/java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml
@@ -77,19 +77,20 @@
<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,uo.parent_org_id parentOrgId,
- uu.name staffName,uo.org_name departmentName,uo.org_id departmentId
- from u_org_staff_rel t,u_org uo,u_user uu
- where t.org_id = uo.org_id
- and t.staff_id = uu.user_id
- <if test="statusCd ==null or statusCd != '1'">
+ uu.name staffName,uo.org_name departmentName,uo.org_id departmentId,td.`name` relCdName
+ from u_org_staff_rel t
+ 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}
@@ -175,8 +176,8 @@
<!-- 鏍规嵁鍛樺伐ID鏌ヨ閮ㄩ棬锛屽叕鍙镐俊鎭� add by zc 2020-02-17 -->
<select id="queryOrgInfoByStaffIds" parameterType="Map" resultType="Map">
select
- t.org_id departmentId,t.staff_id staffId,u.org_name departmentName,
- u.parent_org_id companyId,o.org_name companyName
+ 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
@@ -188,6 +189,9 @@
#{item}
</foreach>
</if>
+ <if test="staffId !=null and staffId !=''">
+ and t.staff_id =#{staffId}
+ </if>
</select>
</mapper>
--
Gitblit v1.8.0