Merge remote-tracking branch 'origin/fixbug_0901' into fixbug_0901

haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml

@@ -369,27 +369,30 @@
     </select>
 
     <select id="listMemberStaffRelNew" resultType="com.gic.haoban.manage.service.entity.ext.MemberStaffRelExtDO">
-        select ecr.member_id as memberId,
-        ecr.external_user_id as memberExternalUserId,
-        scr.staff_id as staffId,
-        scr.clerk_id as staffClerkId
-        from (select a.staff_id,
-        a.clerk_id
-        from tab_haoban_staff_clerk_relation a
-        left join tab_haoban_staff b on a.staff_id = b.staff_id
-        where a.clerk_id in
-        <foreach collection="clerkIdList" item="item" separator="," open="(" close=")">
-            #{item}
-        </foreach>
-        and a.status_flag = 1
-        group by a.staff_id, b.wx_user_id, a.clerk_id) as scr
-        left join tab_haoban_external_clerk_related as ecr on scr.staff_id = ecr.staff_id
-        where ecr.status_flag = 1
-        and ecr.enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
-        and ecr.member_id in
-        <foreach collection="memberIdList" item="item" separator="," open="(" close=")">
-            #{item}
-        </foreach>
+    	select * from (
+	        select ecr.member_id as memberId,
+	        ecr.external_user_id as memberExternalUserId,
+	        scr.staff_id as staffId,
+	        scr.clerk_id as staffClerkId
+	        from    tab_haoban_external_clerk_related as ecr 
+	         left join
+	        (select a.staff_id,
+	        a.clerk_id
+	        from tab_haoban_staff_clerk_relation a
+	        left join tab_haoban_staff b on a.staff_id = b.staff_id
+	        where a.clerk_id in
+	        <foreach collection="clerkIdList" item="item" separator="," open="(" close=")">
+	            #{item}
+	        </foreach>
+	        and a.status_flag = 1
+	        group by a.staff_id, a.clerk_id) as scr   on scr.staff_id = ecr.staff_id
+	        where ecr.status_flag = 1
+	        and ecr.enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
+	        and ecr.member_id in
+	        <foreach collection="memberIdList" item="item" separator="," open="(" close=")">
+	            #{item}
+	        </foreach>
+        ) t where t.staffId is not null 
     </select>