From 526c6c73ffba70b271ff20732d5f84cd0f410834 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 10 Nov 2022 17:07:34 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index 84c4b05..80db3f8 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -292,9 +292,8 @@
Log.info("挂机结束时间到了");
DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.END_TIME.getType(), DataDictionaryEnum.END_TIME.getCode());
DateTime date = DateUtil.date();
- DateTime endTime = DateUtil.parseDate(endTimeDic.getValue());
- if(DateUtil.compare(endTime,date)>=0){
- //
+ DateTime endTime = DateUtil.parseTimeToday(endTimeDic.getValue());
+ if(DateUtil.compare(date,endTime)>=0){
igtOnHookPlanOrderDao.updatePlanOrder();
}
}
@@ -442,6 +441,9 @@
List<DappMemberEntity> dappMemberEntitiesNext = new ArrayList<>();
if(CollUtil.isNotEmpty(dappMemberEntities)){
for(DappMemberEntity dappMemberEntity : dappMemberEntities){
+ if(ObjectUtil.isEmpty(dappMemberEntity)){
+ continue;
+ }
Long memberEntityId = dappMemberEntity.getId();
String refererId = dappMemberEntity.getRefererId();
String inviteId = dappMemberEntity.getInviteId();
--
Gitblit v1.9.1