From 34effee7943c7b64f16aeaf0370715ea161f83f4 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 23 Dec 2021 15:10:16 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=90=86=E4=BA=8B=E4=BC=9A=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jero/common/enums/CompanyMessageEnums.java    | 2 +-
 .../com/jero/meeting/service/impl/PayMeetingServiceImpl.java    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java
index 05b8eacc..980a69d5 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java
@@ -24,7 +24,7 @@ public enum CompanyMessageEnums {
     MSG10("QY_10_YJTZ_MAIL_CONTRACT","邮寄通知","contractName"),//查看该物流信息，contractName
     MSG11("QY_11_CKTZ_PAY","催款通知","projectName"),//弹窗：查看该项目详情
     MSG12("QY_12_WJTZ_WORK_GROUP_SEND","文件通知","workGroupName,systemAddress,wxName"),//弹窗：查看该项目详情，workGroupName，systemUrl，wxName
-    MSG13("QY_13_HYTZ_FBW_CREATE","会议通知","meetingName,busId"),//点击跳转到报名页面，meetingName,busId
+    MSG13("QY_13_HYTZ_FBW_CREATE","会议通知","meetingType,meetingName,busId"),//点击跳转到报名页面，meetingName,busId
     MSG14("QY_14_JFTZ_DZ_CREATE","缴费通知","projectName,amount"),//弹窗：查看该项目详情，projectName,amount
     MSG15("QY_15_KPTZ_KP_CREATE","开票通知","projectName"),//弹窗：查看该项目详情，projectName
     MSG16("QY_16_HYTZ_NOT_AUDIT_CREATE","会议通知",""),//弹窗：查看该会议详情
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
index 527a9b67..beca0ae1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
@@ -567,6 +567,8 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
                 if (StringUtils.isNotBlank(payMeeting.getNotice())) {
                     sendMessageDTO.setMeetingNotice(payMeeting.getNotice());
                 }
+                String meetingType = sysBaseAPI.translateDict("meeting_type", payMeeting.getMeetingType().toString());
+                map.put("meetingType", meetingType);
                 map.put("meetingName", payMeeting.getMeetingName());
                 map.put("busId", meetingId);
                 sendMessageDTO.setEmail(PasswordUtil.decrypt(email));