diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/TemplateMessage.java b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/TemplateMessage.java index 17a009a2..88d71c25 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/TemplateMessage.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/TemplateMessage.java @@ -165,13 +165,11 @@ public class TemplateMessage { continue; } - if(pushable && deviceCache.getDevice(receiver.getId()).shouldPush(appType, PushChannel.NIM)) { + if (pushable && !deviceCache.getDevice(receiver.getId()).shouldPush(appType, PushChannel.NIM)) { ExcludePushPayload excludePush = new ExcludePushPayload(); excludePush.setPersonId(receiver.getId() + ""); excludePush.setAppType(appType); imReq.getExcludePushPayloads().add(excludePush); - if (StringUtils.isNotBlank(pushData.getVoiceFile())) - ext.put(Intent.INTENT_SOUND, pushData.getVoiceFile()); } receivers.add(new ReceivePerson(String.valueOf(receiver.getId()), ouId, appType)); @@ -189,8 +187,11 @@ public class TemplateMessage { ext.put("ouId", String.valueOf(sample.getReceiverOuId())); } imReq.setExt(ext); - if (pushable) + if (pushable) { imReq.setPayload(buildPayload(sample, appType)); + if (StringUtils.isNotBlank(pushData.getVoiceFile())) + ext.put(Intent.INTENT_SOUND, pushData.getVoiceFile()); + } return imReq; }