|
|
@@ -415,8 +415,8 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
// debugMode = false;
|
|
|
}
|
|
|
if(StringUtils.isNotEmpty(jpushType) && jpushType.equals("STUDENT")){
|
|
|
- //如果不是缴费信息 OA审批中的信息
|
|
|
- if(type != STUDENT_PUSH_VIP_BUY && type != OA_NOTICE_PUSH){
|
|
|
+ //如果不是缴费信息
|
|
|
+ if(type != STUDENT_PUSH_VIP_BUY){
|
|
|
int hour = DateUtil.getHour(new Date());
|
|
|
//如果当前时间在22点之后
|
|
|
String messageTime = sysConfigDao.findConfigValue("wait_send_message_time");
|
|
|
@@ -476,6 +476,10 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
} else if (messageSender.getSendMode().equals("EMAIL")) {
|
|
|
mode = MessageSendMode.EMAIL;
|
|
|
}
|
|
|
+ // oa 待审批只推送 不记录表
|
|
|
+ if (type == OA_NOTICE_PUSH) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
addMessage(receiverTenantId, receivers, messageConfig.getDescription(), MessageFormatter.arrayFormat(messageConfig.getContent(), args), triggerTime, mode, status, errorMsg, readStatus,
|
|
|
url, messageConfig.getGroup(),jpushType);
|
|
|
}
|
liujunchi