资讯分页列表（不加标签获取列表数据）

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

@@ -223,8 +223,7 @@ public class InformationController {
             return Result.FAIL("专题id/专题分类id不能为空");
         }
         UserVo userVo = UserUtil.getLoginUser();
-        List<HashMap> pageList = informationService.subjectPageListGroupByLabel(userVo, searchCondition);
-        return Result.OK(pageList);
+        return informationService.subjectPageListGroupByLabel(userVo, searchCondition);
     }
 
     /**

src/main/java/com/zzsn/event/service/InformationService.java

@@ -2,6 +2,7 @@ package com.zzsn.event.service;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zzsn.event.constant.Result;
 import com.zzsn.event.entity.ClbFileOperationLog;
 import com.zzsn.event.util.user.UserVo;
 import com.zzsn.event.vo.*;
@@ -40,7 +41,7 @@ public interface InformationService {
     /**
      * 资讯分页列表（根据标签分类分组）
      */
-    List<HashMap> subjectPageListGroupByLabel(UserVo userVo, InfoDataSearchCondition subjectInfo);
+    Result subjectPageListGroupByLabel(UserVo userVo, InfoDataSearchCondition subjectInfo);
 
     /**
      * 保存数据集-研究中心

src/main/java/com/zzsn/event/service/impl/InformationServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zzsn.event.constant.Constants;
+import com.zzsn.event.constant.Result;
 import com.zzsn.event.entity.*;
 import com.zzsn.event.enums.EnumHandlerStatus;
 import com.zzsn.event.enums.EnumOperateWay;
@@ -155,7 +156,7 @@ public class InformationServiceImpl implements InformationService {
 
 
     @Override
-    public List<HashMap> subjectPageListGroupByLabel(UserVo userVo, InfoDataSearchCondition searchCondition) {
+    public Result subjectPageListGroupByLabel(UserVo userVo, InfoDataSearchCondition searchCondition) {
         List<HashMap> list = new ArrayList<>();
         Integer category = searchCondition.getCategory();
         List<String> subjectIdList = new ArrayList<>();
@@ -176,7 +177,7 @@ public class InformationServiceImpl implements InformationService {
             }
         }
         if (CollectionUtils.isEmpty(subjectIdList)) {
-            return list;
+            return Result.OK(list);
         }
         try {
             IPage<SpecialInformation> specialInformationIPage = esService.pageListByCondition(searchCondition, subjectIdList);
@@ -202,11 +203,32 @@ public class InformationServiceImpl implements InformationService {
                     map.put("infoList",displayInfos);
                     list.add(map);
                 });
+            }else{
+                //不加标签获取列表数据
+                searchCondition.setLabelMark(null);
+                specialInformationIPage = esService.pageListByCondition(searchCondition, subjectIdList);
+                long totalT = specialInformationIPage.getTotal();
+                if (totalT > 0) {
+                    List<DisplayInfo> dataList = new ArrayList<>();
+                    List<LabelModelVo> labelModelVos = commonService.subjectModelBindLabels(subjectIdList);
+                    Map<String, List<LabelModelVo>> modelMap = labelModelVos.stream().collect(Collectors.groupingBy(LabelModelVo::getSubjectId));
+                    List<SpecialInformation> records = specialInformationIPage.getRecords();
+                    for (SpecialInformation specialInformation : records) {
+                        DisplayInfo info = new DisplayInfo();
+                        BeanUtils.copyProperties(specialInformation, info);
+                        info.setPublishDate(EsDateUtil.esFieldDateMapping(info.getPublishDate()));
+                        //标签处理
+                        List<LabelModelVo> modelVoList = modelMap.get(info.getSubjectId());
+                        formatLabel(modelVoList, info);
+                        dataList.add(info);
+                    }
+                    return Result.OK(dataList);
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return list;
+        return Result.OK(list);
     }
 
     public Map<String, List<DisplayInfo>> groupedByLabelMark(List<DisplayInfo> dataList) {