修改uaid的空判断

feige

2025-06-20 e416ac6496d52be7ac416da33ea4395cf9bcc4e9

 zhang-content/src/main/java/com/ruoyi/service/impl/EsServiceImpl.java

@@ -85,7 +85,7 @@
        boolQueryBuilder.should(QueryBuilders.matchQuery("by4",con));
        boolQueryBuilder.should(QueryBuilders.matchQuery("by6",con));
        boolQueryBuilder.should(QueryBuilders.matchQuery("by7",con));
        boolQueryBuilder.filter(QueryBuilders.termsQuery("fid", idList));


        NativeSearchQueryBuilder nativeSearchQueryBuilder = new NativeSearchQueryBuilder()
                .withQuery(boolQueryBuilder);
@@ -100,7 +100,9 @@
        });
       // articleList.forEach(a-> System.out.println(a))

        return esm;
        return esm.stream().filter(esModel -> {
            return idList.contains(esModel.getFid());
        }).collect(Collectors.toList());

    }

@@ -119,7 +121,11 @@
                .withQuery(boolQueryBuilder);
        NativeSearchQuery nativeSearchQuery = nativeSearchQueryBuilder.build();

        return Objects.requireNonNull(elasticsearchRestTemplate.searchOne(nativeSearchQuery, EsModel.class)).getContent();
        SearchHit<EsModel> esModelSearchHit = elasticsearchRestTemplate.searchOne(nativeSearchQuery, EsModel.class);
        if(esModelSearchHit != null){
            return esModelSearchHit.getContent();
        }
        return null;

    }