|
@@ -287,8 +287,7 @@ public class CoreServiceImpl implements CoreService {
|
|
|
|
|
|
public boolean checkPlanAccount(PlanAccount planAccount) {
|
|
|
boolean isGzhGroupPushPlan = Objects.nonNull(planAccount.getPushType())
|
|
|
- && (PublishGzhPushTypeEnum.auto_group_publish.getVal().equals(planAccount.getPushType())
|
|
|
- || PublishGzhPushTypeEnum.batch_group_publish.getVal().equals(planAccount.getPushType()));
|
|
|
+ && PublishGzhPushTypeEnum.auto_group_publish.getVal().equals(planAccount.getPushType());
|
|
|
boolean flag = true;
|
|
|
// 固定日期
|
|
|
if (planAccount.getPublishRate() == 1) {
|
|
@@ -300,7 +299,7 @@ public class CoreServiceImpl implements CoreService {
|
|
|
}
|
|
|
}
|
|
|
// 指定时间
|
|
|
- if (StringUtils.isNotEmpty(planAccount.getPublishPushTime())) {
|
|
|
+ if (isGzhGroupPushPlan && StringUtils.isNotEmpty(planAccount.getPublishPushTime())) {
|
|
|
long pushTime = DateUtil.convertToTimestamp(planAccount.getPublishPushTime());
|
|
|
long nowTime = new Date().getTime();
|
|
|
// 当前时间距离目标时间超过30分钟
|