Merge branch 'DLS-Release-v1.2.0' into DLS-Release-v1.2.1

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs

@@ -2444,7 +2444,7 @@ Competencies AS c INNER JOIN
                          CompetencyGroups AS cg ON fcg.CompetencyGroupID = cg.ID
                     WHERE (fc.FrameworkID = @frameworkId)
                     GROUP BY fc.ID, c.ID, cg.Name, cg.Description, c.Name, c.Description, c.AlwaysShowDescription, fcg.Ordering, fc.Ordering
-                    ORDER BY COALESCE(fcg.Ordering,99999), fc.Ordering",
+                    ORDER BY COALESCE(fcg.Ordering,99999), fc.Ordering, fc.ID",
                                 new { frameworkId }
                             );
             }
@@ -2457,7 +2457,7 @@ public List<int> GetFrameworkCompetencyOrder(int frameworkId, List<int> framewor
                     FROM   FrameworkCompetencies AS fc LEFT JOIN
                                  FrameworkCompetencyGroups AS fcg ON fc.FrameworkCompetencyGroupID = fcg.ID
                     WHERE (fc.FrameworkID = @frameworkId) AND (fc.ID IN @frameworkCompetencyIds)
-                    ORDER BY COALESCE(fcg.Ordering,99999), fc.Ordering",
+                    ORDER BY COALESCE(fcg.Ordering,99999), fc.Ordering, fc.ID",
                                 new { frameworkId, frameworkCompetencyIds }
                             ).ToList();
         }