提交代码

Mall.Repository/Education/RB_Education_ActivityRepository.cs

@@ -71,15 +71,19 @@ WHERE 1=1
                         builder.AppendFormat($" and  DATE_FORMAT(a.{nameof(RB_Education_Activity_Extend.EndTime)},'%Y-%m-%d' )<= DATE_FORMAT('{query.SelectEndTimeStr}','%Y-%m-%d' ) ");
                     }
                 }
-
-
-                if (!string.IsNullOrWhiteSpace(query.OrderByStr))
+                if (query.SelectIsEnd == 1)
                 {
-                    builder.AppendFormat($" ORDER BY A.{query.OrderByStr}  asc");
+                    builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Education_Activity_Extend.StartTime));
                 }
-                else
-                {
-                    builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Education_Activity_Extend.Id));
+                else {
+                    if (!string.IsNullOrWhiteSpace(query.OrderByStr))
+                    {
+                        builder.AppendFormat($" ORDER BY A.{query.OrderByStr}  asc");
+                    }
+                    else
+                    {
+                        builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Education_Activity_Extend.Id));
+                    }
                 }
             }
             return GetPage<RB_Education_Activity_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();