Merge pull request #3299 from TechnologyEnhancedLearning/Develop/Fixes/TD-5709-FixFrameworksError

TD-5709 fix frameworks error affecting some users

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs

@@ -301,12 +301,13 @@ FROM FrameworkCollaborators fc
 				        AND aa3.UserID = (SELECT aa4.UserID FROM AdminAccounts aa4 WHERE aa4.ID = @adminId)) > 0 THEN 1
                 ELSE 0
             END AS UserRole,
-            (SELECT fwr.ID
+            (SELECT TOP(1) fwr.ID
 				FROM FrameworkCollaborators fc
 				INNER JOIN AdminAccounts aa3 ON fc.AdminID = aa3.ID
 				LEFT OUTER JOIN FrameworkReviews AS fwr ON fc.ID = fwr.FrameworkCollaboratorID AND fwr.Archived IS NULL AND fwr.ReviewComplete IS NULL
 				WHERE fc.FrameworkID = fw.ID AND fc.IsDeleted = 0
-				AND aa3.UserID = (SELECT aa4.UserID FROM AdminAccounts aa4 WHERE aa4.ID = @adminId)) AS FrameworkReviewID";
+				AND aa3.UserID = (SELECT aa4.UserID FROM AdminAccounts aa4 WHERE aa4.ID = @adminId)
+                AND aa3.Active = 1 ORDER BY fwr.ID DESC) AS FrameworkReviewID";
 
         private const string BrandedFrameworkFields =
             @",(SELECT BrandName