Merge branch 'master' into developer

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

@@ -1406,11 +1406,18 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
     @Override
     public ExternalUserDTO getExternalUseridInfo(String wxEnterpriseId, String wxUserId, String externalUserId) {
+        log.info("查询第三方:wxEnterpriseId:{},wxUserId:{},externalUserId:{}", wxEnterpriseId, wxUserId, externalUserId);
         WxEnterpriseDTO wxEnterprise = wxEnterpriseService.selectById(wxEnterpriseId);
         if (wxEnterprise == null) {
             log.info("企业不存在");
             return null;
         }
+        TabHaobanStaff tabHaobanStaff = staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
+        if (tabHaobanStaff == null) {
+            log.info("员工不存在，wxUserId：{}", wxUserId);
+            return null;
+        }
+        String wxOpenUseId = tabHaobanStaff.getWxOpenUseId();
         String uJ = qywxUserApiService.getExternalUseridInfo(wxEnterprise.getCorpid(), config.getWxSuiteid(), externalUserId);
         if (StringUtils.isBlank(uJ)) {
             log.info("好友不存在");
@@ -1444,7 +1451,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                     String followJson = JSON.toJSONString(object);
                     JSONObject follow = JSON.parseObject(followJson);
                     uj_userId = follow.getString("userid");
-                    if (uj_userId.equals(wxUserId)) {
+                    //第三方返回的是加密的，多做一层判断
+                    if (uj_userId.equals(wxUserId) || uj_userId.equals(wxOpenUseId)) {
                         if (jt != null) {
                             externalUserId = jt.getString("external_userid");
                             createTime = follow.getString("createtime");