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 |    7 +++++--
 1 files changed, 5 insertions(+), 2 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 d2dac9f..52c9991
--- a/java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml
@@ -176,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
@@ -189,6 +189,9 @@
                 #{item}
             </foreach>
         </if>
+        <if test="staffId !=null and staffId !=''">
+            and t.staff_id =#{staffId}
+        </if>
     </select>
 
 </mapper>

--
Gitblit v1.8.0