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 8d15e9ab2..7649620b2 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
@@ -60,9 +60,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
         //需要查询的列表字段
         List<OnlCgformField> hearOnlCgformFieldList = fieldList.stream()
                 .filter(e -> YesOrNoEnum.YES.getValue().equals(e.getIsShowSearch())).collect(Collectors.toList());
-//        List<String> sourceList = new ArrayList<>();
         List<String> sourceList = hearOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
-
         //输入框字段
         List<OnlCgformField> inputOnlCgformFieldList = fieldList.stream()
                 .filter(e -> FieldTypeEnum.TEXT_STRING.getValue().equals(e.getFieldShowType())
@@ -120,61 +118,32 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
             }
         }
 
-        String indexName = "documentLibrary";
-        String typeName = "document";
-
-//        String json = JSON.toJSONString(map);//map转String
-//        JSONObject queryObject = JSON.parseObject(json);
-
+//        String indexName = "documentLibrary";
+//        String typeName = "document";
         JSONObject search = null;
         try {
-            //查询所有字段
 
             //封装查询条件
-//            JSONObject jsonObject = jeroElasticsearchTemplate.buildQueryString( "serial_number","*55*");
-//            JSONObject jsonObject = jeroElasticsearchTemplate.buildQueryString( "555");
-//            JSONArray must = new JSONArray();
-//            must.add("555");
-//            JSONArray mustNot = new JSONArray();
-//            mustNot.add("555");
 
-            Map<String,Object> queryMap = new HashMap<>();
-            Map<String,Object> queryMap2 = new HashMap<>();
-            queryMap2.put("serial_number","555");
-//            queryMap2.put("title","13");
-            queryMap.put("match_phrase",queryMap2);
-
-            Map<String,Object> queryMap3 = new HashMap<>();
-            Map<String,Object> queryMap4 = new HashMap<>();
-            queryMap4.put("title","载货汽车定型试验");
-//            queryMap2.put("title","13");
-            queryMap3.put("match",queryMap4);
-
-            Map<String,Object> queryMap5 = new HashMap<>();
-            Map<String,Object> queryMap6 = new HashMap<>();
-            queryMap6.put("issue_time","2022-03-10");
-//            queryMap2.put("title","13");
-            queryMap5.put("match",queryMap6);
-
-
-            should.add(queryMap);
-            should.add(queryMap3);
-//            should.add(queryMap5);
-            must.add(queryMap);
-//            must.add(queryMap3);
-//            should.add(queryMap5);
+//            Map<String,Object> queryMap = new HashMap<>();
+//            Map<String,Object> queryMap2 = new HashMap<>();
+//            queryMap2.put("serial_number","1332");
+//            queryMap.put("term",queryMap2);
+//            must.add(queryMap);
 
+            //
             JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(must, null, null);
 
-
             //封装分页和字段值
-//            sourceList.add("serial_number");
-//            sourceList.add("title");
-            JSONObject serial_number = jeroElasticsearchTemplate.buildQuery(sourceList, jsonObject,"issue_time", 0,10);
+//            JSONObject queryObject = jeroElasticsearchTemplate.buildQuery(sourceList, jsonObject,null, 0,10);
+            JSONObject queryObject = jeroElasticsearchTemplate.buildQuery(sourceList, jsonObject,null, Integer.parseInt(map.get("pageNo").toString()),Integer.parseInt(map.get("pageSize").toString()));
 //
             //数据查询
-            search = jeroElasticsearchTemplate.search(indexName, typeName, serial_number);
-//            search = jeroElasticsearchTemplate.search(indexName, typeName, new JSONObject());
+            search = jeroElasticsearchTemplate.search("documentLibrary", "document", queryObject);
+//            Map map1 = JSONObject.parseObject(search.toJSONString(), Map.class);
+//            String s = search.toJSONString();
+//            Map<String,Object> map2 = JSON.parseObject(search.toJSONString(), Map.class);
+//            List<Map<String,Object>> list = ((Map) search.get("hits")).get("hits");
         } catch (Exception e) {
             e.printStackTrace();
         }