刷新好友标签

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/QywxTagApiService.java

@@ -90,7 +90,7 @@ public interface QywxTagApiService {
      * @param externalUserId
      * @return
      */
-    public ServiceResponse syncQywxTagToGicByExternalUserId(String wxEnterpriseId, String externalUserId, String wxUserId);
+    public ServiceResponse syncQywxTagToGicByExternalUserId(String wxEnterpriseId, String externalUserId, String wxUserId , String externalUserInfo);
 
     /**
      * 更改状态

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

@@ -606,7 +606,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
 
 
     @Override
-    public ServiceResponse syncQywxTagToGicByExternalUserId(String wxEnterpriseId, String externalUserId, String wxUserId) {
+    public ServiceResponse syncQywxTagToGicByExternalUserId(String wxEnterpriseId, String externalUserId, String wxUserId , String externalUserInfo) {
         //刷新标签的时候不允许同步
         ServiceResponse resp = new ServiceResponse();
         //所有以及关联同步的标签
@@ -622,11 +622,15 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
         //查询外部联系人
         String externalUseridInfo = null ;
-        if(qwDTO.isSelf()) {
-            externalUseridInfo = this.qywxUserApiService.getCorpSelfExternalUseridInfo(qwDTO.getDkCorpid(), qwDTO.getSelfSecret(), externalUserId,qwDTO.getUrlHost()) ;
+        if(null != externalUserInfo) {
+            externalUseridInfo =  externalUserInfo ;
         }else {
+            if (qwDTO.isSelf()) {
+                externalUseridInfo = this.qywxUserApiService.getCorpSelfExternalUseridInfo(qwDTO.getDkCorpid(), qwDTO.getSelfSecret(), externalUserId, qwDTO.getUrlHost());
+            } else {
                 externalUseridInfo = this.qywxUserApiService.getExternalUseridInfo(qwDTO.getThirdCorpid(), config.getWxSuiteid(), externalUserId);
             }
+        }
         if (StringUtils.isBlank(externalUseridInfo)) {
             logger.info("好友不存在");
             resp.setCode(2);