es 查询修改

purchase-admin/src/main/java/com/ozs/web/controller/base/BasePolicyController.java

@@ -69,7 +69,12 @@ public class BasePolicyController extends BaseController {
             }
             List<String> ids = maps.stream().map(EsMessage::getId).collect(Collectors.toList());
 //            lw.like(BasePolicy::getName,vo.getName());
-            lw.in(BasePolicy::getEsId, ids);
+            if(!ObjectUtils.isEmpty(ids)){
+                lw.in(BasePolicy::getEsId, ids);
+            }else {
+                lw.like(BasePolicy::getName, vo.getName());
+            }
+
         }
         if (!ObjectUtils.isEmpty(vo.getStartTime())) {
             lw.ge(BasePolicy::getReleaseTime, vo.getStartTime());

purchase-common/src/main/java/com/ozs/common/utils/file/FileUtils.java

@@ -37,6 +37,7 @@ import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
+import org.springframework.util.ObjectUtils;
 
 /**
  * 文件处理工具类
@@ -341,12 +342,17 @@ public class FileUtils {
 
         //builder.query(QueryBuilders.matchQuery("attachment.content", msg).analyzer("ik_smart"));
         SearchResponse searchResponse = EsUtil.selectDocument("fileindex", builder);
-        SearchHits hits = searchResponse.getHits();
-
-        for (SearchHit hit : hits.getHits()) {
-            hit.getSourceAsMap().put("msg", "");
-            matchRsult.add(JSON.parseObject(JSON.toJSONString(hit.getSourceAsMap()),EsMessage.class));
-            // System.out.println(hit.getSourceAsString());
+        log.info("searchResponse:{}",searchResponse);
+        if(!ObjectUtils.isEmpty(searchResponse)){
+            SearchHits hits = searchResponse.getHits();
+
+            for (SearchHit hit : hits.getHits()) {
+                hit.getSourceAsMap().put("msg", "");
+                matchRsult.add(JSON.parseObject(JSON.toJSONString(hit.getSourceAsMap()),EsMessage.class));
+                // System.out.println(hit.getSourceAsString());
+            }
+        }else {
+            log.info("查询条件msg:{}， es查询结果为空",msg);
         }
         System.out.println("over in the main");