GRAD2-2580

(GRAD) Fix User Request Distribution Run options - Part 2 - CUR and Null Distribution Dates
bcgov · May 16, 2024 · d9fe79b · d9fe79b
1 parent 1f9500c
commit d9fe79b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/grad/report/controller/CommonController.java b/api/src/main/java/ca/bc/gov/educ/api/grad/report/controller/CommonController.java
@@ -279,7 +279,7 @@ public ResponseEntity<List<StudentCredentialDistribution>> getStudentCredentials
         logger.debug("getStudentCredentialsForUserRequestDisRun : ");
         boolean isPenNumberSearch = studentSearchRequest.getPens() != null && !studentSearchRequest.getPens().isEmpty()
                 && !studentSearchRequest.getPens().stream().filter(StringUtils::isNotBlank).toList().isEmpty();
-        boolean onlyWithNullDistributionDate = !isPenNumberSearch && studentSearchRequest.getGradDateFrom() == null && studentSearchRequest.getGradDateTo() == null;
+        boolean onlyWithNullDistributionDate = !isPenNumberSearch && studentSearchRequest.getGradDateFrom() == null && studentSearchRequest.getGradDateTo() == null && !StringUtils.equalsAnyIgnoreCase(credentialType, "OT", "RT");
         return response.GET(commonService.getStudentCredentialsForUserRequestDisRun(credentialType,studentSearchRequest,onlyWithNullDistributionDate,accessToken.replace(BEARER, "")));
     }