Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

liyanqi

2022-10-27 509b52219b44cbbf16c3b364da566ed00f8aabbe

 ycl-platform/src/main/java/com/ycl/service/message/factory/MailSender.java

@@ -53,13 +53,15 @@
    public Message sendMessage(MessageParam messageParam) {
        //入库保存
        Message message = innerSender.sendMessage(messageParam);
        //发起审核
        iSmsAuditService.startAuditSms(message);
        //id换成邮箱号
        String targetToMail = adminService.getTargetTo(messageParam.getTargetTo(), messageParam.getChannelCode());
        message.setTargetTo(targetToMail);
        //发送邮件
        sendMail(message);
        if (messageParam.getStatus() == 1) {
            //发起审核
            iSmsAuditService.startAuditSms(message);
            //id换成邮箱号
            String targetToMail = adminService.getTargetTo(messageParam.getTargetTo(), messageParam.getChannelCode());
            message.setTargetTo(targetToMail);
            //发送邮件
            sendMail(message);
        }
        return message;
    }