From cc4229833be378b67d803ba0ef82fc5d29169e85 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 30 Mar 2022 08:58:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DocumentSearchServiceImpl.java       | 13 ++++++++++---
 .../modules/searchcenter/vo/SearchVO.java     | 19 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
index 3dae26db6..57a778602 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
@@ -458,7 +458,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
         //判断索引是否存在
         boolean flagTemp = jeroElasticsearchTemplate.indexExists(SearchEnum.FULL_TEXT_SEARCH.getValue());
         if (!flagTemp) {
-            return new Page(searchVO.getPage(), searchVO.getPageSize());
+            return new Page(searchVO.getPageNo(), searchVO.getPageSize());
         }
         String selectValue = searchVO.getSelectValue();
         String selectValueTwo = searchVO.getSelectValueTwo();
@@ -492,7 +492,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
                 queryMapJson.add(queryMap);
             }
         }
-        Integer pageNo = searchVO.getPage();
+        Integer pageNo = searchVO.getPageNo();
         Integer pageSize = searchVO.getPageSize();
         IPage page = getiPage(selectValue, selectValueTwo, queryMapJson, null, pageNo, pageSize, null);
 
@@ -524,10 +524,17 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
                 SearchEnum.FULL_TEXT_SEARCH.getValue(),
                 queryObject);
 
+
+        JSONObject queryObjectAll = jeroElasticsearchTemplate.buildQuery(null,
+                null,
+                null,
+                null,
+                pageNo,
+                pageSize);
         //全部的数据(调试接口用--最后删除即可)
         JSONObject searchAll = jeroElasticsearchTemplate.search(SearchEnum.FULL_TEXT_SEARCH.getValue(),
                 SearchEnum.FULL_TEXT_SEARCH.getValue(),
-                new JSONObject());
+                queryObjectAll);
 
 
         List<Map<String, Object>> list = (List<Map<String, Object>>) (((Map) search.get("hits")).get("hits"));
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/vo/SearchVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/vo/SearchVO.java
index 892895a13..77f37f27a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/vo/SearchVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/vo/SearchVO.java
@@ -2,7 +2,7 @@ package com.jero.modules.searchcenter.vo;
 
 import com.jero.modules.split.common.BasePage;
 
-public class SearchVO extends BasePage {
+public class SearchVO {
 
 
 
@@ -24,7 +24,24 @@ public class SearchVO extends BasePage {
     private String itemsName;
     private String itemsNum;
     private String parts;
+    private Integer pageNo;
+    private Integer pageSize;
 
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
 
     public String getIds() {
         return ids;