Merge branch 'feature' into 'dev'

Feature

See merge request !133

src/main/java/com/zhiwei/brandkbs2/dao/impl/ChannelDaoImpl.java

@@ -44,11 +44,6 @@ public class ChannelDaoImpl extends BaseMongoDaoImpl<Channel> implements Channel
         if (null == channelIndex) {
             return null;
         }
-//        Query query = Query.query(Criteria.where("linkedGroupId").is(channelIndex.getLinkedGroupId()).
-//                and("projectId").is(channelIndex.getProjectId()).
-//                and("platform").is(channelIndex.getPlatform()).
-//                and("realSource").is(channelIndex.getRealSource()).
-//                and("source").is(channelIndex.getSource()));
         return queryUnique(channelIndex.getFid());
     }
 

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

@@ -855,7 +855,7 @@ public class EventServiceImpl implements EventService {
 
     @Override
     public PageData<JSONObject> eventChannelVoices(String eventId, String type, int page, int pageSize, String sorter) {
-        return eventClient.eventChannelVoices(eventId, type, page, pageSize, sorter);
+        return eventClient.eventChannelVoices(eventId, type, page, pageSize, sorter, UserThreadLocal.getProjectId());
     }
 
     @Override