Merge branch 'feature/xgh/代开发调整25年' into 'developer'

企微自建转代开发调整

See merge request !2415

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

@@ -426,6 +426,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
     @Override
     public String addMemberUnionidRelated(QwFrientNoticeDTO dto) {
+        log.info("加好友={}",JSONObject.toJSONString(dto));
         DealQywxExternalUserPojo dealQywxExternalUserPojo = new DealQywxExternalUserPojo();
         dealQywxExternalUserPojo.setType(DealQywxExternalUserPojo.DealType.add.getType());
         dealQywxExternalUserPojo.setData(dto);
@@ -445,7 +446,18 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     
     private void sendWelcome(QwFrientNoticeDTO dto) {
         String suiteid = dto.getSuiteid();
-        if (SELF_APP.equals(suiteid)) {
+        String corpId = dto.getCorpid();
+        TabHaobanWxEnterprise wxEnterprise = this.wxEnterpriseService.getEnterpriseBycorpId(corpId) ;
+        if(null == wxEnterprise) {
+            log.info("企业查不到={}",corpId);
+            return ;
+        }
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterprise.getWxEnterpriseId());
+        if (qwDTO == null) {
+            log.info("企业不存在,wxEnterpriseId={}", wxEnterprise.getWxEnterpriseId());
+            return;
+        }
+        if (SELF_APP.equals(suiteid) && qwDTO.getWxSecurityType()!=6) {
            return ;
         } 
         if(StringUtils.isEmpty(dto.getWelcomeCode())) {