Merge pull request #2942 from TechnologyEnhancedLearning/Develop/Features/TD-4884-Preventsupervisorsfromviewing/reviewingselfassessmentsinacategorythatdoesn'tmatchtheirownallowall

TD-4884 Prevent supervisors from viewing/reviewing self assessments in a category that doesn't match their own

Author: kevwhitt-hee

DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs

@@ -690,7 +690,7 @@ FROM   CandidateAssessmentSupervisors AS cas INNER JOIN
                              NRPSubGroups AS sg ON sa.NRPSubGroupID = sg.ID LEFT OUTER JOIN
                              NRPRoles AS r ON sa.NRPRoleID = r.ID
                              LEFT OUTER JOIN SelfAssessmentSupervisorRoles AS sasr ON cas.SelfAssessmentSupervisorRoleID = sasr.ID
-                WHERE (ca.ID = @candidateAssessmentId) AND (cas.Removed IS NULL) AND (sd.SupervisorAdminID = @adminId) AND (sa.CategoryID = @adminIdCategoryId)",
+                WHERE (ca.ID = @candidateAssessmentId) AND (cas.Removed IS NULL) AND (sd.SupervisorAdminID = @adminId) AND (ISNULL(@adminIdCategoryID, 0) = 0 OR sa.CategoryID = @adminIdCategoryId)",
                 new { candidateAssessmentId, adminId, adminIdCategoryId }
                 ).FirstOrDefault();
         }