Merge branch 'feature/maintenance' into Task/65111

exoplatform · Jul 7, 2023 · 96c2eb6 · 96c2eb6
2 parents 356d6ad + eb0a38f
commit 96c2eb6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/services/src/main/java/org/exoplatform/news/queryBuilder/NewsQueryBuilder.java b/services/src/main/java/org/exoplatform/news/queryBuilder/NewsQueryBuilder.java
@@ -55,7 +55,7 @@ public StringBuilder buildQuery(NewsFilter filter) throws Exception {
         if (filter.getSearchText() != null && !filter.getSearchText().equals("")) {
           String escapedQuoteSearchText = filter.getSearchText().replace("'", "''").replace("\"", "\"\"");
           sqlQuery.append("CONTAINS(.,'").append(escapedQuoteSearchText).append("')");
-          if (!filter.getTagNames().isEmpty()){
+          if (filter.getTagNames() != null && !filter.getTagNames().isEmpty()){
             sqlQuery.append(" OR (");
             for (String tagName : filter.getTagNames()) {
               sqlQuery.append(" exo:body LIKE '%#").append(tagName).append("%'");