From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突
---
java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml
index d7e8073..d2dac9f 100644
--- a/java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml
@@ -77,10 +77,12 @@
<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
+ 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'
--
Gitblit v1.8.0