From 5776b5a6b230184418f3297d060dc64e8b83c2f6 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Thu, 6 Jul 2023 16:30:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dnull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commonbiz/service/impl/PushApplicationServiceImpl.java | 2 +-
 .../commonbiz/service/impl/PushConcernFanServiceImpl.java  | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java
index 80bcb1b9..7b6e5c4c 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java
@@ -123,7 +123,7 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
                 pushChatMessage.setPlayToText(pushConcernFanType.getPlayToText());
                 pushChatMessage.setSound(pushConcernFanType.getOfflineRingtone());
                 pushChatMessage.setOnlineRingtone(Optional.ofNullable(iPushRingtoneService.getById(pushConcernFanType.getOnlineRingtone()))
-                        .orElse(null).getRingtone());
+                        .orElse(new PushRingtone()).getRingtone());
             }
 
             pushChatMessage.setType("customizedcast");
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java
index 7c4102e1..3f902df5 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java
@@ -9,10 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cloud.kicc.common.core.exception.CheckedException;
-import com.cloud.kicc.commonbiz.api.entity.PushBlacklist;
-import com.cloud.kicc.commonbiz.api.entity.PushChatMessage;
-import com.cloud.kicc.commonbiz.api.entity.PushConcernFan;
-import com.cloud.kicc.commonbiz.api.entity.PushConcernFanType;
+import com.cloud.kicc.commonbiz.api.entity.*;
 import com.cloud.kicc.commonbiz.api.enums.PushAuditStatusEnum;
 import com.cloud.kicc.commonbiz.mapper.PushConcernFanMapper;
 import com.cloud.kicc.commonbiz.service.*;
@@ -130,7 +127,7 @@ public class PushConcernFanServiceImpl extends ServiceImpl<PushConcernFanMapper,
                 pushChatMessage.setPlayToText(pushConcernFanType.getPlayToText());
                 pushChatMessage.setSound(pushConcernFanType.getOfflineRingtone());
                 pushChatMessage.setOnlineRingtone(Optional.ofNullable(iPushRingtoneService.getById(pushConcernFanType.getOnlineRingtone()))
-                        .orElse(null).getRingtone());
+                        .orElse(new PushRingtone()).getRingtone());
             }
 
             pushChatMessage.setType("customizedcast");