Merge branch 'release' into 'master'

Release

See merge request !451

src/main/java/com/zhiwei/brandkbs2/service/impl/ChannelServiceImpl.java

@@ -516,8 +516,6 @@ public class ChannelServiceImpl implements ChannelService {
 		// 过滤掉不符合时间条件的数据并排序
 		Map<String, List<ChannelRecord>> channelRecords = keyMap.values().stream().map(pair -> {
 			ChannelRecord channelRecord = pair.getRight();
-			// 情感过滤
-			if (emotion == EmotionEnum.ALL.getState() || emotion == channelRecord.getEmotion()) {
 			List<ChannelIndex.Article> articles = ChannelIndex.Record.filterArticles(startTime, endTime,
 					channelRecord.getRecord().getArticles(), emotion);
 			if (0 == articles.size()) {
@@ -526,8 +524,6 @@ public class ChannelServiceImpl implements ChannelService {
 			articles.sort(Comparator.comparingLong(ChannelIndex.Article::getTime).reversed());
 			channelRecord.getRecord().setArticles(articles);
 			return channelRecord;
-			}
-			return null;
 		}).filter(Objects::nonNull).collect(Collectors.groupingBy(ChannelRecord::getPlatform));
 		for (String platformName : PLATFORMS) {
 			List<ChannelRecord> channelRecordList = channelRecords.getOrDefault(platformName, Collections.emptyList()).stream().limit(size).collect(Collectors.toList());