From 975cc44d4ab8825b768fbb0d77200f6e6de2f787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Sat, 9 Oct 2021 19:30:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jero/common/enums/MessageUrlEnums.java  | 4 ++--
 .../jero/mail/controller/PayMailContractController.java   | 2 +-
 .../service/impl/PayPackCompanyProjectServiceImpl.java    | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java
index eb3a483d..dab771ec 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java
@@ -29,9 +29,9 @@ public enum MessageUrlEnums {
     C_OPEN_TYPE5("C_OPEN_TYPE5","component","MessagePage/UploadMeetingCertificateModal"),
     C_OPEN_TYPE6("C_OPEN_TYPE6","component","MessagePage/MeetingDetailModal"),
     C_OPEN_TYPE7("C_OPEN_TYPE7","component","MessagePage/MeetingDetailModal"),
-    C_OPEN_TYPE8("C_OPEN_TYPE8","href","https://www.kuaidi100.com/all/hhair56.shtml?mscomnu="),
+    C_OPEN_TYPE8("C_OPEN_TYPE8","",""),
     C_OPEN_TYPE9("C_OPEN_TYPE9","href","https://www.kuaidi100.com/all/hhair56.shtml?mscomnu="),
-    C_OPEN_TYPE10("C_OPEN_TYPE10","",""),
+    C_OPEN_TYPE10("C_OPEN_TYPE10","href","https://www.kuaidi100.com/all/hhair56.shtml?mscomnu="),
     C_OPEN_TYPE11("C_OPEN_TYPE11","component","MessagePage/ProjectDetailModal"),
     C_OPEN_TYPE12("C_OPEN_TYPE12","component","MessagePage/ProjectDetailModal");
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
index 60c9fda8..5f9d09c0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
@@ -125,7 +125,7 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 						sendMessageDTO.setPhone(PasswordUtil.decrypt(payMailContractData.getMobile()));
 					}
 					HashMap<String, String> map = new HashMap<>();
-					if (Objects.isNull(payIncomeContract)) {
+					if (!Objects.isNull(payIncomeContract)) {
 						map.put("contractName", payIncomeContract.getContractName());
 					}
 					sendMessageDTO.setFromUser(sysUser.getUsername());
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
index 3d8ced25..e2ea3140 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
@@ -140,11 +140,11 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
                 }
                 // 发送消息
                 SendMessageDTO sendMessageDTO = new SendMessageDTO();
-                if(!StringUtils.isBlank(p.getEmail())){
-                    sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
+                if(!StringUtils.isBlank(sysUserData.getEmail())){
+                    sendMessageDTO.setEmail(PasswordUtil.decrypt(sysUserData.getEmail()));
                 }
-                if(!StringUtils.isBlank(p.getPhone())){
-                    sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone()));
+                if(!StringUtils.isBlank(sysUserData.getPhone())){
+                    sendMessageDTO.setPhone(PasswordUtil.decrypt(sysUserData.getPhone()));
                 }
                 HashMap<String,String> map = new HashMap<>();
                 map.put("projectName",p.getChargeProject());