Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Model/Entity/Course/RB_Course.cs

@@ -378,7 +378,7 @@ namespace Edu.Model.Entity.Course
         public decimal ForeignHours { get; set; }
 
         /// <summary>
-        /// 上架状态(1-显示，2-隐藏)
+        /// 显示状态(1-显示，2-隐藏)
         /// </summary>
         public int SaleState { get; set; }
     }

Edu.Repository/Course/RB_CourseRepository.cs

@@ -229,6 +229,7 @@ WHERE 1=1
                     }
                 }
             }
+            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Course_ViewModel.CourseId));
             return GetPage<RB_Course_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
 

Edu.Repository/Grade/RB_ClassRepository.cs

@@ -382,8 +382,7 @@ WHERE 1=1
 ");
             builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Status), 0);
             builder.AppendFormat(" AND A.{0} in(1,2) ", nameof(RB_Class_ViewModel.ClassStatus));
-            builder.AppendFormat(" AND B.Saleplat<>'' ");
-            builder.AppendFormat(" AND B.SaleState=1 ");
+            builder.AppendFormat(" AND B.Saleplat<>'' AND B.SaleState=1 AND B.Status=0 ");
             if (query != null)
             {
                 if (query.Group_Id > 0)