Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

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

@@ -517,6 +517,7 @@
           and status_flag in (1, 3, 4)
         order by create_time
     </select>
+
     <select id="listByMemberIds" resultMap="BaseResultMap">
         select
         external_user_id,
@@ -528,7 +529,6 @@
             #{item}
         </foreach>
         and status_flag = 1
-        group by enterprise_id,wx_enterprise_id
     </select>
 
     <select id="listMemberIdsByMemberIds" resultType="String">
@@ -552,6 +552,7 @@
         <if test="enterpriseId != null and enterpriseId != ''">
             and enterprise_id = #{enterpriseId}
         </if>
+        group by enterprise_id,wx_enterprise_id
     </select>
 
     <select id="listByExternalUserId" resultMap="BaseResultMap">