|
@@ -1340,10 +1340,12 @@ public class CoreServiceImpl implements CoreService {
|
|
|
if (CollectionUtils.isEmpty(pushContentList)) {
|
|
|
return null;
|
|
|
}
|
|
|
- //自动群发少于最少数量不发送
|
|
|
+ //自动群发少于最少数量不发送 例外设置数量少于最少发送数量不发送
|
|
|
if (Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.auto_group_publish.getVal())
|
|
|
- && pushContentList.size() < planAccount.getPublishPreMinNum()) {
|
|
|
- return null;
|
|
|
+ || planAccount.getIsSpecialSetting() == 1) {
|
|
|
+ if (pushContentList.size() < planAccount.getPublishPreMinNum()) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
}
|
|
|
gzhPushParam.setPushContentList(pushContentList);
|
|
|
return gzhPushParam;
|