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 |  298 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 162 insertions(+), 136 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 99112c1..52c9991
--- a/java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml
@@ -5,167 +5,193 @@
 <mapper namespace="orgStaffRelServiceDaoImpl">
 
     <!-- 淇濆瓨缁勭粐鍛樺伐鍏崇郴淇℃伅 add by wuxw 2018-07-03 -->
-       <insert id="saveBusinessOrgStaffRelInfo" parameterType="Map">
-           insert into business_org_staff_rel(
-rel_id,operate,store_id,b_id,org_id,staff_id,rel_cd
-) values (
-#{relId},#{operate},#{storeId},#{bId},#{orgId},#{staffId},#{relCd}
-)
-       </insert>
+    <insert id="saveBusinessOrgStaffRelInfo" parameterType="Map">
+        insert into business_org_staff_rel(
+        rel_id,operate,store_id,b_id,org_id,staff_id,rel_cd
+        ) values (
+        #{relId},#{operate},#{storeId},#{bId},#{orgId},#{staffId},#{relCd}
+        )
+    </insert>
 
 
-       <!-- 鏌ヨ缁勭粐鍛樺伐鍏崇郴淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
-       <select id="getBusinessOrgStaffRelInfo" parameterType="Map" resultType="Map">
-           select  t.rel_id,t.rel_id relId,t.operate,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 
-from business_org_staff_rel t 
-where 1 =1 
-<if test="relId !=null and relId != ''">
-   and t.rel_id= #{relId}
-</if> 
-<if test="operate !=null and operate != ''">
-   and t.operate= #{operate}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="orgId !=null and orgId != ''">
-   and t.org_id= #{orgId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-   and t.staff_id= #{staffId}
-</if> 
-<if test="relCd !=null and relCd != ''">
-   and t.rel_cd= #{relCd}
-</if> 
+    <!-- 鏌ヨ缁勭粐鍛樺伐鍏崇郴淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
+    <select id="getBusinessOrgStaffRelInfo" parameterType="Map" resultType="Map">
+        select t.rel_id,t.rel_id relId,t.operate,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
+        from business_org_staff_rel t
+        where 1 =1
+        <if test="relId !=null and relId != ''">
+            and t.rel_id= #{relId}
+        </if>
+        <if test="operate !=null and operate != ''">
+            and t.operate= #{operate}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="orgId !=null and orgId != ''">
+            and t.org_id= #{orgId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
+        <if test="relCd !=null and relCd != ''">
+            and t.rel_cd= #{relCd}
+        </if>
 
-       </select>
-
-
-
+    </select>
 
 
     <!-- 淇濆瓨缁勭粐鍛樺伐鍏崇郴淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveOrgStaffRelInfoInstance" parameterType="Map">
         insert into u_org_staff_rel(
-rel_id,status_cd,store_id,b_id,org_id,staff_id,rel_cd
-) select t.rel_id,'0',t.store_id,t.b_id,t.org_id,t.staff_id,t.rel_cd from business_org_staff_rel t where 1=1
-<if test="relId !=null and relId != ''">
-   and t.rel_id= #{relId}
-</if> 
-   and t.operate= 'ADD'
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="orgId !=null and orgId != ''">
-   and t.org_id= #{orgId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-   and t.staff_id= #{staffId}
-</if> 
-<if test="relCd !=null and relCd != ''">
-   and t.rel_cd= #{relCd}
-</if> 
+        rel_id,status_cd,store_id,b_id,org_id,staff_id,rel_cd
+        ) select t.rel_id,'0',t.store_id,t.b_id,t.org_id,t.staff_id,t.rel_cd from business_org_staff_rel t where 1=1
+        <if test="relId !=null and relId != ''">
+            and t.rel_id= #{relId}
+        </if>
+        and t.operate= 'ADD'
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="orgId !=null and orgId != ''">
+            and t.org_id= #{orgId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
+        <if test="relCd !=null and relCd != ''">
+            and t.rel_cd= #{relCd}
+        </if>
 
     </insert>
 
 
-
     <!-- 鏌ヨ缁勭粐鍛樺伐鍏崇郴淇℃伅 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 
-from u_org_staff_rel t 
-where 1 =1 
-<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}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="orgId !=null and orgId != ''">
-   and t.org_id= #{orgId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-   and t.staff_id= #{staffId}
-</if> 
-<if test="relCd !=null and relCd != ''">
-   and t.rel_cd= #{relCd}
-</if> 
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        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
+        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="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="orgId !=null and orgId != ''">
+            and t.org_id= #{orgId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
+        <if test="relCd !=null and relCd != ''">
+            and t.rel_cd= #{relCd}
+        </if>
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 淇敼缁勭粐鍛樺伐鍏崇郴淇℃伅 add by wuxw 2018-07-03 -->
     <update id="updateOrgStaffRelInfoInstance" parameterType="Map">
-        update  u_org_staff_rel t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="storeId !=null and storeId != ''">
-, t.store_id= #{storeId}
-</if> 
-<if test="orgId !=null and orgId != ''">
-, t.org_id= #{orgId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-, t.staff_id= #{staffId}
-</if> 
-<if test="relCd !=null and relCd != ''">
-, t.rel_cd= #{relCd}
-</if> 
- where 1=1 <if test="relId !=null and relId != ''">
-and t.rel_id= #{relId}
-</if> 
-<if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if> 
+        update u_org_staff_rel t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            , t.store_id= #{storeId}
+        </if>
+        <if test="orgId !=null and orgId != ''">
+            , t.org_id= #{orgId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            , t.staff_id= #{staffId}
+        </if>
+        <if test="relCd !=null and relCd != ''">
+            , t.rel_cd= #{relCd}
+        </if>
+        where 1=1
+        <if test="relId !=null and relId != ''">
+            and t.rel_id= #{relId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
 
     </update>
 
     <!-- 鏌ヨ缁勭粐鍛樺伐鍏崇郴鏁伴噺 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 
-<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}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="orgId !=null and orgId != ''">
-   and t.org_id= #{orgId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-   and t.staff_id= #{staffId}
-</if> 
-<if test="relCd !=null and relCd != ''">
-   and t.rel_cd= #{relCd}
-</if> 
+    <select id="queryOrgStaffRelsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        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>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="orgId !=null and orgId != ''">
+            and t.org_id= #{orgId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
+        <if test="relCd !=null and relCd != ''">
+            and t.rel_cd= #{relCd}
+        </if>
 
 
-     </select>
+    </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