LPS-138913 minor SF

brianchandotcom · Sep 17, 2021 · 40320e6 · 40320e6
1 parent dd31844
commit 40320e6
Showing 1 changed file with 17 additions and 19 deletions.
diff --git a/...ternal/info/collection/provider/ObjectEntrySingleFormVariationInfoCollectionProvider.java b/...ternal/info/collection/provider/ObjectEntrySingleFormVariationInfoCollectionProvider.java
@@ -197,7 +197,6 @@ private SearchContext _buildSearchContext(CollectionQuery collectionQuery)
 			Field.STATUS, WorkflowConstants.STATUS_APPROVED);
 		searchContext.setAttribute(
 			"objectDefinitionId", _objectDefinition.getObjectDefinitionId());
-
 		searchContext.setBooleanClauses(_getBooleanClauses(collectionQuery));
 
 		ServiceContext serviceContext =
@@ -236,16 +235,16 @@ private BooleanClause[] _getBooleanClauses(CollectionQuery collectionQuery)
 
 		BooleanQuery booleanQuery = new BooleanQueryImpl();
 
+		List<ObjectField> objectFields =
+			_objectFieldLocalService.getObjectFields(
+				_objectDefinition.getObjectDefinitionId());
+
 		Optional<Map<String, String[]>> configurationOptional =
 			collectionQuery.getConfigurationOptional();
 
 		Map<String, String[]> configuration = configurationOptional.orElse(
 			Collections.emptyMap());
 
-		List<ObjectField> objectFields =
-			_objectFieldLocalService.getObjectFields(
-				_objectDefinition.getObjectDefinitionId());
-
 		for (Map.Entry<String, String[]> entry : configuration.entrySet()) {
 			String[] values = entry.getValue();
 
@@ -258,23 +257,22 @@ private BooleanClause[] _getBooleanClauses(CollectionQuery collectionQuery)
 			ObjectField objectField = _getObjectField(
 				entry.getKey(), objectFields);
 
-			if (objectField != null) {
-				BooleanQuery nestedBooleanQuery = new BooleanQueryImpl();
+			if (objectField == null) {
+				continue;
+			}
 
-				nestedBooleanQuery.add(
-					new TermQueryImpl(
-						"nestedFieldArray.fieldName", entry.getKey()),
-					BooleanClauseOccur.MUST);
+			BooleanQuery nestedBooleanQuery = new BooleanQueryImpl();
 
-				nestedBooleanQuery.add(
-					new TermQueryImpl(
-						_getField(objectField), entry.getValue()[0]),
-					BooleanClauseOccur.MUST);
+			nestedBooleanQuery.add(
+				new TermQueryImpl(_getField(objectField), entry.getValue()[0]),
+				BooleanClauseOccur.MUST);
+			nestedBooleanQuery.add(
+				new TermQueryImpl("nestedFieldArray.fieldName", entry.getKey()),
+				BooleanClauseOccur.MUST);
 
-				booleanQuery.add(
-					new NestedQuery("nestedFieldArray", nestedBooleanQuery),
-					BooleanClauseOccur.MUST);
-			}
+			booleanQuery.add(
+				new NestedQuery("nestedFieldArray", nestedBooleanQuery),
+				BooleanClauseOccur.MUST);
 		}
 
 		return new BooleanClause[] {