feat：发送欢迎语判断逻辑修改

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

@@ -543,6 +543,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String content = tabWelcome.getWelcomeContent().replaceAll("<微信昵称>", externalName);
         QywxWelcomeMsgDTO qywxWelcomeMsgDTO = new QywxWelcomeMsgDTO();
         qywxWelcomeMsgDTO.setText(content);
+        List<QywxExternalMessageBaseDTO> attachments = new ArrayList<>();
         //发送小程序
         if (sendApp) {
             log.info("发送小程序：{}", wxEnterpriseId);
@@ -551,25 +552,27 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                 log.info("需要配置小程序配置：wxEnterpriseId:{},enterpriseId:{}", wxEnterpriseId, staffClerkRelationDTO.getEnterpriseId());
                 return;
             }
-            List<QywxExternalMessageBaseDTO> attachments = new ArrayList<>();
             QywxMiniprogramExternalBaseDTO messageBaseDTO = new QywxMiniprogramExternalBaseDTO();
             messageBaseDTO.setAppid(miniprogramSetting.getAppId());
             messageBaseDTO.setPicMediaId(miniprogramSetting.getMediaId());
             messageBaseDTO.setTitle(miniprogramSetting.getTitle());
             messageBaseDTO.setPage(config.getMemberOpenPage() + relationKey);
             attachments.add(messageBaseDTO);
-            String welcomeImg = tabWelcome.getWelcomeImg();
-            if (StringUtils.isNotBlank(welcomeImg)) {
-                String[] arr = welcomeImg.split("/");
-                int count = arr.length;
-                JSONResponse jp = qywxSuiteApiService.uploadMedia(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), getFileByte(welcomeImg), arr[count - 1], QywxMediaTypeEnum.IMAGE.getCode());
-                log.info("欢迎语发送图片返回：{}", JSON.toJSONString(jp));
-                if (jp.getErrorCode() == 0) {
-                    QywxImageExternalBaseDTO qywxImageExternalBaseDTO = new QywxImageExternalBaseDTO();
-                    qywxImageExternalBaseDTO.setMediaId(jp.getResult().toString());
-                    attachments.add(qywxImageExternalBaseDTO);
-                }
+        }
+        //发送图片
+        String welcomeImg = tabWelcome.getWelcomeImg();
+        if (StringUtils.isNotBlank(welcomeImg)) {
+            String[] arr = welcomeImg.split("/");
+            int count = arr.length;
+            JSONResponse jp = qywxSuiteApiService.uploadMedia(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), getFileByte(welcomeImg), arr[count - 1], QywxMediaTypeEnum.IMAGE.getCode());
+            log.info("欢迎语发送图片返回：{}", JSON.toJSONString(jp));
+            if (jp.getErrorCode() == 0) {
+                QywxImageExternalBaseDTO qywxImageExternalBaseDTO = new QywxImageExternalBaseDTO();
+                qywxImageExternalBaseDTO.setMediaId(jp.getResult().toString());
+                attachments.add(qywxImageExternalBaseDTO);
             }
+        }
+        if (CollectionUtils.isNotEmpty(attachments)) {
             qywxWelcomeMsgDTO.setAttachments(attachments);
         }
         qywxWelcomeMsgDTO.setWelcomeCode(dto.getWelcomeCode());