Merge branch 'feature' into 'dev'

修复isCollect为空bug

See merge request !19

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

@@ -485,7 +485,7 @@ public class ChannelServiceImpl implements ChannelService {
         jsonObject.put("articlesCount", channel.getArticleCount());
         jsonObject.put("eventCount", channel.getEventCount());
         jsonObject.put("channelTag", channelTagDao.getTagByChannelName(channel.getSource()));
-        if (channel.getIsCollect()) {
+        if (Boolean.TRUE.equals(channel.getIsCollect())) {
             jsonObject.put("collectTime", channel.getCollectTime());
         }
         // 渠道倾向变化 TODO