kanglai
/
kicc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix: 修复null

master
wangxiang 2 years ago
parent
8e406925b4
commit
5776b5a6b2
2 changed files with 3 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java
  2. 7
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java

2
kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java
Unescape View File

@ -123,7 +123,7 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
pushChatMessage.setPlayToText(pushConcernFanType.getPlayToText()); pushChatMessage.setPlayToText(pushConcernFanType.getPlayToText());
pushChatMessage.setSound(pushConcernFanType.getOfflineRingtone()); pushChatMessage.setSound(pushConcernFanType.getOfflineRingtone());
pushChatMessage.setOnlineRingtone(Optional.ofNullable(iPushRingtoneService.getById(pushConcernFanType.getOnlineRingtone())) pushChatMessage.setOnlineRingtone(Optional.ofNullable(iPushRingtoneService.getById(pushConcernFanType.getOnlineRingtone()))
.orElse(null).getRingtone()); .orElse(new PushRingtone()).getRingtone());
} }
pushChatMessage.setType("customizedcast"); pushChatMessage.setType("customizedcast");

7
kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java
Unescape View File

@ -9,10 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cloud.kicc.common.core.exception.CheckedException; import com.cloud.kicc.common.core.exception.CheckedException;
import com.cloud.kicc.commonbiz.api.entity.PushBlacklist; import com.cloud.kicc.commonbiz.api.entity.*;
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.enums.PushAuditStatusEnum; import com.cloud.kicc.commonbiz.api.enums.PushAuditStatusEnum;
import com.cloud.kicc.commonbiz.mapper.PushConcernFanMapper; import com.cloud.kicc.commonbiz.mapper.PushConcernFanMapper;
import com.cloud.kicc.commonbiz.service.*; import com.cloud.kicc.commonbiz.service.*;
@ -130,7 +127,7 @@ public class PushConcernFanServiceImpl extends ServiceImpl<PushConcernFanMapper,
pushChatMessage.setPlayToText(pushConcernFanType.getPlayToText()); pushChatMessage.setPlayToText(pushConcernFanType.getPlayToText());
pushChatMessage.setSound(pushConcernFanType.getOfflineRingtone()); pushChatMessage.setSound(pushConcernFanType.getOfflineRingtone());
pushChatMessage.setOnlineRingtone(Optional.ofNullable(iPushRingtoneService.getById(pushConcernFanType.getOnlineRingtone())) pushChatMessage.setOnlineRingtone(Optional.ofNullable(iPushRingtoneService.getById(pushConcernFanType.getOnlineRingtone()))
.orElse(null).getRingtone()); .orElse(new PushRingtone()).getRingtone());
} }
pushChatMessage.setType("customizedcast"); pushChatMessage.setType("customizedcast");

Write Preview
Loading…
Cancel
Save