|
|
@@ -54,6 +54,7 @@ import java.util.concurrent.CompletableFuture;
|
|
|
import java.util.concurrent.ExecutorService;
|
|
|
import java.util.concurrent.Executors;
|
|
|
|
|
|
+import static com.ym.mec.biz.dal.enums.MessageTypeEnum.OA_NOTICE_PUSH;
|
|
|
import static com.ym.mec.biz.dal.enums.MessageTypeEnum.STUDENT_PUSH_VIP_BUY;
|
|
|
|
|
|
@Service
|
|
|
@@ -414,8 +415,8 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
// debugMode = false;
|
|
|
}
|
|
|
if(StringUtils.isNotEmpty(jpushType) && jpushType.equals("STUDENT")){
|
|
|
- //如果不是缴费信息
|
|
|
- if(type != STUDENT_PUSH_VIP_BUY){
|
|
|
+ //如果不是缴费信息 OA审批中的信息
|
|
|
+ if(type != STUDENT_PUSH_VIP_BUY && type != OA_NOTICE_PUSH){
|
|
|
int hour = DateUtil.getHour(new Date());
|
|
|
//如果当前时间在22点之后
|
|
|
String messageTime = sysConfigDao.findConfigValue("wait_send_message_time");
|
liujunchi