Merge branch 'feature/自建应用验证' into 'master'

自建关联

See merge request !1229

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

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