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

第三方主体unionid转换为第三方external_userid 自建没有

See merge request !1196

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

@@ -1547,6 +1547,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             }
             String wxEnterpriseId = tabHaobanWxEnterpris.getWxEnterpriseId();
             WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
+            if(qwDTO.isSelf()) {
+                continue ;
+            }
             String corpid = qwDTO.getThirdCorpid();
             List<UnionidToExternalUseridDTO> unionidToExternalUseridDTOS = qywxUserApiService.unionidToExternalUserid3rd(unionid, openId, corpid, config.getWxSuiteid());
             if (CollectionUtils.isEmpty(unionidToExternalUseridDTOS)) {

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

@@ -221,11 +221,7 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
         qywxTagService.closeSync(wxEnterpriseId, memberTagId);
         List<String> delIds = new ArrayList<>();
         delIds.add(tabQywxTag.getQywxGroupKey());
-        String secret = config.getWxSuiteid() ;
-        if(qwDTO.isSelf()) {
-          secret = qwDTO.getSelfSecret() ;
-        }
-        QywxResponseDTO responseDTO = qywxSuiteApiService.delCorpTag(qwDTO.getThirdCorpid(), secret, delIds, 0,qwDTO.isSelf(),qwDTO.getUrlHost());
+        QywxResponseDTO responseDTO = qywxSuiteApiService.delCorpTag(qwDTO.getThirdCorpid(), QwUtils.getSecret(qwDTO, config.getWxSuiteid()), delIds, 0,qwDTO.isSelf(),qwDTO.getUrlHost());
         logger.info("关闭同步：{}", JSONObject.toJSONString(responseDTO));
         if (responseDTO.getErrcode() != 0) {
             resp.setMessage(responseDTO.getErrmsg());