From 6e8c95d31d85b53857e4e3ce12ea303eb0ea42eb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 19 八月 2021 00:47:48 +0800
Subject: [PATCH] 优化代码

---
 java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 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 d9f6ca3..52c9991
--- a/java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml
@@ -78,12 +78,11 @@
         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,td.`name` relCdName
-        from u_org_staff_rel t,u_org uo,u_user uu,t_dict td
-        where t.org_id = uo.org_id
-        and t.staff_id = uu.user_id
-        and t.rel_cd = td.status_cd
-        and td.table_name = 'u_org_staff_rel'
-        and td.table_columns = 'rel_cd'
+        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'
@@ -177,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
@@ -190,6 +189,9 @@
                 #{item}
             </foreach>
         </if>
+        <if test="staffId !=null and staffId !=''">
+            and t.staff_id =#{staffId}
+        </if>
     </select>
 
 </mapper>

--
Gitblit v1.8.0