Merge branch 'feature/五月二期' into 'developer'

好友查询

See merge request !1306

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java

@@ -121,6 +121,11 @@ public interface TabHaobanExternalClerkRelatedMapper {
                                                                               @Param("enterpriseId") String enterpriseId,
                                                                               @Param("externalUserId") String externalUserId);
     
+    TabHaobanExternalClerkRelated getExternalClerkByWxUserIdAncExternalUserIdSelf(@Param("wxEnterpriseId") String wxEnterpriseId,
+            @Param("staffId") String staffId,
+            @Param("enterpriseId") String enterpriseId,
+            @Param("externalUserId") String externalUserId);
+
     /**
      * 查询会员在企业下的好友关系
      *

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ExternalClerkRelatedApiServiceImpl.java

@@ -329,6 +329,9 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     @Override
     public ExternalClerkRelatedDTO getExternalClerkByWxUserIdAncExternalUserId(String wxEnterpriseId, String staffId, String enterpriseId, String externalUserId) {
         TabHaobanExternalClerkRelated externalClerkRelated = tabHaobanExternalClerkRelatedMapper.getExternalClerkByWxUserIdAncExternalUserId(wxEnterpriseId, staffId, enterpriseId, externalUserId);
+        if(null == externalClerkRelated) {
+            externalClerkRelated = this.tabHaobanExternalClerkRelatedMapper.getExternalClerkByWxUserIdAncExternalUserIdSelf(wxEnterpriseId, staffId, enterpriseId, externalUserId) ;
+        }
         return EntityUtil.changeEntityNew(ExternalClerkRelatedDTO.class, externalClerkRelated);
     }
 

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

@@ -439,6 +439,18 @@
         order by update_time desc limit 1
     </select>
     
+    <select id="getExternalClerkByWxUserIdAncExternalUserIdSelf" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_external_clerk_related
+        where staff_id = #{staffId,jdbcType=VARCHAR}
+        and wx_enterprise_id = #{wxEnterpriseId}
+        and enterprise_id = #{enterpriseId} 
+        and self_external_userid = #{externalUserId}
+        and status_flag in(1,3,4)
+        order by update_time desc limit 1
+    </select>
+
     <select id="listByMemberIdAndWxEnterpriseId" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java

@@ -657,7 +657,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
             logger.info("请先添加好友，企业微信未查询到该好友,externalUserid:{}", externalUserid);
             return resultResponse(HaoBanErrCode.ERR_11126);
         } 
-        if(!qwInfo.isSelf()) {
+        /*if(!qwInfo.isSelf()) {
             MemberUnionidRelatedDTO memberUnionidRelatedDTO = memberUnionidRelatedApiService.getBySelfExternalUserId(wxEnterpriseId, externalUserid);
             if (null == memberUnionidRelatedDTO) {
                 logger.info("请刷新好友，wxEnterpriseId:{},传入的externalUserid：{},wxUserId:{}", wxEnterpriseId, externalUserid, wxUserId);
@@ -665,7 +665,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
             }
             externalUserid = memberUnionidRelatedDTO.getExternalUserid() ;
             logger.info("会员数据：{}", JSON.toJSONString(memberUnionidRelatedDTO));
-        }
+        }*/
         ExternalClerkRelatedDTO clerkRelatedDTO = externalClerkRelatedApiService.getExternalClerkByWxUserIdAncExternalUserId(wxEnterpriseId, staffId, gicEnterpriseId, externalUserid);
         if (clerkRelatedDTO == null) {
             logger.info("该企业没有对应需要发送好友关系的信息，wxEnterpriseId:{},externalUserid：{},wxUserId:{}", wxEnterpriseId, externalUserid, wxUserId);