Merge branch 'fix-02-21_group_send' of http://git.gicdev.com/haoban3.0/haoban-manage3.0

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

@@ -393,16 +393,17 @@
         ecr.external_user_id as memberExternalUserId,
         scr.wx_user_id as staffWxUserId,
         scr.clerk_id as staffClerkId
-    from (select staff_id,
-                 wx_user_id,
-                 clerk_id
-          from tab_haoban_staff_clerk_relation
-          where clerk_id in
+        from (select a.staff_id,
+                    b.wx_user_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 status_flag = 1
-            group by staff_id, wx_user_id, clerk_id) as scr
+        and a.status_flag = 1
+        group by a.staff_id, a.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}