【支持事件专题】

src/main/java/com/zzsn/event/es/EsService.java

@@ -620,7 +620,7 @@ public class EsService {
     public IPage<EventDataVO> collectPageList(InfoDataSearchCondition eventDataCondition) {
         String index = Constants.COLLECT_INDEX;
         if ("1".equals(eventDataCondition.getIsSubject())) {
-            Subject byId = subjectService.getById(eventDataCondition.getSubjectId());
+            Subject byId = subjectService.getSubjectOrEventById(eventDataCondition.getSubjectId());
             //更新开始、结束时间
             if (byId.getTimeEnable() != null) {
                 String timeEnable = DateUtil.format(byId.getTimeEnable(), "yyyy-MM-dd");