From 89470eb6f8e7833a2ee5aebcced03e7fb8a534eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=9B=E5=AE=8F=E7=A5=A5?=
 <14281818+xue-hongxiang@user.noreply.gitee.com>
Date: Thu, 19 Dec 2024 14:27:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=8A=A5=E4=BF=AE=E4=B8=AD?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=B3=E9=A2=86=E7=89=A9=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MaintenancePlanServiceImpl.java       | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java
index be89c8e..55bcb91 100644
--- a/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java
+++ b/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java
@@ -26,10 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static org.springblade.common.constant.CommonConstant.*;
@@ -291,7 +288,18 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl<MaintenancePlanM
             List<User> maintenanceSupervisorList = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, roleId));
             try {
                 for (User maintenanceSupervisor : maintenanceSupervisorList) {
-                    smsService.sendSms(maintenanceSupervisor.getPhone(), maintenanceSupervisor.getRealName());
+                    Optional<String> phone = Optional.ofNullable(maintenanceSupervisor.getPhone());
+                    if (phone.isEmpty()) {
+                        continue;
+                        //TODO 当手机号为空时需要处理的逻辑
+                    }
+                    Optional<String> realName = Optional.ofNullable(maintenanceSupervisor.getRealName());
+                    //TODO 当真实姓名为空时需要处理的逻辑
+                    if (realName.isEmpty()) {
+                        smsService.sendSms(phone.get(), "未实名");
+                    } else {
+                        smsService.sendSms(phone.get(), realName.get());
+                    }
                 }
             } catch (Exception e) {
                 throw new RuntimeException(e);