Merge pull request #1093 from PublicisSapient/Lead_Time_For_Change_Fix

Update JiraIssueRepositoryImpl.java
PublicisSapient · Jun 12, 2024 · d3b0137 · d3b0137
2 parents 11461b7 + 7494636
commit d3b0137
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/...java/com/publicissapient/kpidashboard/common/repository/jira/JiraIssueRepositoryImpl.java b/...java/com/publicissapient/kpidashboard/common/repository/jira/JiraIssueRepositoryImpl.java
@@ -831,9 +831,15 @@ public List<JiraIssue> findByRelease(Map<String, List<String>> mapOfFilters,
 			projectCriteriaList.add(projectCriteria);
 		});
 
-		Criteria criteriaAggregatedAtProjectLevel = new Criteria()
-				.orOperator(projectCriteriaList.toArray(new Criteria[0]));
-		Criteria criteriaProjectLevelAdded = new Criteria().andOperator(criteria, criteriaAggregatedAtProjectLevel);
+		Criteria criteriaProjectLevelAdded =null;
+		if(CollectionUtils.isNotEmpty(projectCriteriaList)) {
+			Criteria criteriaAggregatedAtProjectLevel = new Criteria()
+					.orOperator(projectCriteriaList.toArray(new Criteria[0]));
+			criteriaProjectLevelAdded = new Criteria().andOperator(criteria, criteriaAggregatedAtProjectLevel);
+		}
+		else{
+			criteriaProjectLevelAdded= new Criteria().andOperator(criteria);
+		}
 		Query query = new Query(criteriaProjectLevelAdded);
 		// add projection
 		return operations.find(query, JiraIssue.class);
@@ -893,4 +899,4 @@ public List<JiraIssue> findIssueByNumberWithAdditionalFilter(Set<String> storyNu
 		return operations.find(query, JiraIssue.class);
 	}
 
-}
+}