|
@@ -864,7 +864,9 @@ public class ArticleAuditService {
|
|
|
startTime = DateUtils.dateStrToTimestamp(param.getDateStrBegin(), "yyyyMMdd");
|
|
|
endTime = DateUtils.dateStrToTimestamp(param.getDateStrEnd(), "yyyyMMdd");
|
|
|
}
|
|
|
- List<PublishGzhPushDTO> pushList = publishContentMapper.getPushByPushTimeBetween(startTime * 1000, endTime * 1000, param.getAccountNames());
|
|
|
+ List<String> accountNames = Objects.nonNull(param.getAccountNames()) ? param.getAccountNames() : null;
|
|
|
+ List<PublishGzhPushDTO> pushList = publishContentMapper.getPushByPushTimeBetween(startTime * 1000,
|
|
|
+ endTime * 1000, accountNames);
|
|
|
List<String> pushIds = pushList.stream().map(PublishGzhPushDTO::getPushId).collect(Collectors.toList());
|
|
|
Map<String, String> pushIdMap = pushList.stream().filter(o -> StringUtils.hasText(o.getGroupPushMsgId()))
|
|
|
.collect(Collectors.toMap(PublishGzhPushDTO::getPushId, PublishGzhPushDTO::getGroupPushMsgId));
|