From fe99ba1caaebaa40c33ad1e3f1ee2c4dfd012795 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期一, 24 一月 2022 12:20:24 +0800
Subject: [PATCH] Merge branch 'Phase3' of https://192.168.0.10:8443/r/pcalife/PAM into Phase3
---
pamapi/src/main/java/com/pollex/pam/service/ScheduleTaskService.java | 13 +++++++++----
PAMapp/assets/scss/vendors/elementUI/_select.scss | 3 +++
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/PAMapp/assets/scss/vendors/elementUI/_select.scss b/PAMapp/assets/scss/vendors/elementUI/_select.scss
index 515da4a..815b184 100644
--- a/PAMapp/assets/scss/vendors/elementUI/_select.scss
+++ b/PAMapp/assets/scss/vendors/elementUI/_select.scss
@@ -31,6 +31,9 @@
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
+ &:before {
+ content: "\e910";
+ }
}
}
diff --git a/pamapi/src/main/java/com/pollex/pam/service/ScheduleTaskService.java b/pamapi/src/main/java/com/pollex/pam/service/ScheduleTaskService.java
index 4cf9cc4..57324b5 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ScheduleTaskService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ScheduleTaskService.java
@@ -73,12 +73,17 @@
consultantWithPendingAppointments.forEach((agentNo, pendingAppointments) -> {
int pendingAppointmentsSum = pendingAppointments.size();
Consultant consultant = consultantService.findByAgentNo(agentNo);
- String consultantPhoneNumber = consultant.getPhoneNumber();
- String consultantEmail = consultant.getEmail();
+ Optional<String> optionalPhone = Optional.ofNullable(consultant.getPhoneNumber()).filter(StringUtils::hasText);
+ Optional<String> optionalEmail = Optional.ofNullable(consultant.getEmail()).filter(StringUtils::hasText);
+
String emailContent = getAppointmentPendingNotifyEmailContent(pendingAppointmentsSum);
- sendMsgService.sendMsgBySMS(consultantPhoneNumber, String.format("����%s������脰�蝜恬������", pendingAppointmentsSum));
- sendMsgService.sendMsgByEmail(consultantEmail, NOT_CONTACTED_NOTIFY_SUBJECT, emailContent, true);
+ optionalPhone.ifPresent(phone -> {
+ sendMsgService.sendMsgBySMS(phone, String.format("����%s������脰�蝜恬������", pendingAppointmentsSum));
+ });
+ optionalEmail.ifPresent(email -> {
+ sendMsgService.sendMsgByEmail(email, NOT_CONTACTED_NOTIFY_SUBJECT, emailContent, true);
+ });
});
log.info("Sending appointment pending notify to consultant finish");
--
Gitblit v1.8.0