Merge branch 'feature/社群' into 'developer'

log

See merge request !693

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatServiceImpl.java

@@ -693,12 +693,14 @@ public class GroupChatServiceImpl implements GroupChatService {
     // 匹配群成员-客户
     private void matchGicMember(String wxEnterpriseId, String enterpriseId, String unionid, String externalUserId,
             TabGroupChatUser user) {
+        logger.info("入群匹配群客户,unionid={},exteruserid={}",unionid,externalUserId);
         if (StringUtils.isBlank(enterpriseId)) {
             return;
         }
         if (StringUtils.isNotBlank(unionid)) {
             MemberDTO member = this.memberService.getMemberByUnionid(unionid, enterpriseId);
             if (null != member) {
+                logger.info("匹配群客户,unionid");
                 user.setMemberId(member.getMemberId());
                 user.setUserType(3);
             }
@@ -706,6 +708,7 @@ public class GroupChatServiceImpl implements GroupChatService {
             TabHaobanExternalClerkRelated related = this.externalClerkRelatedMapper
                     .getMemberForExternalId(wxEnterpriseId, externalUserId);
             if (null != related) {
+                logger.info("匹配群客户,externalUserId");
                 user.setMemberId(related.getMemberId());
                 user.setUserType(3);
             }

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

@@ -758,11 +758,11 @@
 	<select id="getMemberForExternalId"  resultMap="BaseResultMap">
 		 select <include refid="Base_Column_List"/>
        	from tab_haoban_external_clerk_related  where wx_enterprise_id = #{wxEnterpriseId}  
-           and self_external_userid = #{externalUserId} and status_flag = 1 and member_id <![CDATA[ <> ''  ]]>
+           and self_external_userid = #{externalUserId} and status_flag in (1,3,4) and member_id <![CDATA[ <> '']]>
            union 
            select <include refid="Base_Column_List"/>
        	from tab_haoban_external_clerk_related  where wx_enterprise_id = #{wxEnterpriseId}  
-           and external_user_id = #{externalUserId} and status_flag = 1 and member_id <![CDATA[ <> ''  ]]>
+           and external_user_id = #{externalUserId} and status_flag in (1,3,4) and member_id <![CDATA[ <> '' ]]>
            limit 1
 	</select>