【fix】资讯接口条件校验

src/main/java/com/zzsn/event/controller/common/InformationController.java

@@ -205,6 +205,9 @@ public class InformationController {
         if (StringUtils.isEmpty(searchCondition.getSubjectId())) {
             return Result.FAIL("专题id/专题分类id不能为空");
         }
+        if (searchCondition.getCategory() == null) {
+            return Result.FAIL("专题类型不能为空");
+        }
         UserVo userVo = UserUtil.getLoginUser();
         IPage<DisplayInfo> pageList = informationService.subjectPageList(userVo, searchCondition);
         return Result.OK(pageList);

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

@@ -1774,12 +1774,14 @@ public class EsService {
         if (CollectionUtils.isNotEmpty(subjectIdList)) {
             Integer category = searchCondition.getCategory();
             boolQuery.must(QueryBuilders.termsQuery("subjectId.keyword", subjectIdList));
+            //单个专题/事件，默认加上专题/事件的时间范围
             if (subjectIdList.size() == 1) {
                 String configStartTime = null;
                 String configEndTime = null;
                 String id = subjectIdList.get(0);
                 if (category == 1) {
                     Subject subject = subjectService.getById(id);
+                    if (!Objects.isNull(subject)) {
                         Date timeEnable = subject.getTimeEnable();
                         if (!Objects.isNull(timeEnable)) {
                             configStartTime = DateUtil.dateToString(timeEnable);
@@ -1788,8 +1790,10 @@ public class EsService {
                         if (!Objects.isNull(timeDisable)) {
                             configEndTime = DateUtil.dateToString(timeDisable);
                         }
+                    }
                 } else if (category == 2) {
                     Event event = eventService.getById(id);
+                    if (!Objects.isNull(event)) {
                         Date startTime = event.getStartTime();
                         if (!Objects.isNull(startTime)) {
                             configStartTime = DateUtil.dateToString(startTime);
@@ -1799,6 +1803,7 @@ public class EsService {
                             configEndTime = DateUtil.dateToString(endTime);
                         }
                     }
+                }
                 //时间过滤筛选-专题配置
                 if (StringUtils.isNotBlank(configStartTime)) {
                     boolQuery.filter(QueryBuilders.rangeQuery("publishDate").gte(EsDateUtil.esFieldDateFormat(configStartTime)));

src/main/java/com/zzsn/event/vo/InfoDataSearchCondition.java

@@ -8,6 +8,8 @@ import java.util.List;
 @Data
 public class InfoDataSearchCondition {
 
+    //subjectId是否专题id(1-是;0-否)
+    private String isSubject = "1";
     //专题id/专题分类id
     private String subjectId;
 
@@ -64,8 +66,7 @@ public class InfoDataSearchCondition {
     private Integer category;
     //是否视频 "video"
     private String video;
-    //subjectId是否专题id(1-是;0-否)
-    private String isSubject = "1";
+
     //爬虫类型
     private String crawler;
     /**----企业类标签筛选----**/