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

Edu.Repository/Sell/RB_OrderRepository.cs

@@ -1196,7 +1196,7 @@ WHERE 1=1
 ");
             builder.AppendFormat(" AND o.OrderState IN({0},{1}) ", (int)OrderStateEnum.Normal, (int)OrderStateEnum.DropOut);
             builder.AppendFormat(" AND o.{0}={1} ", nameof(RB_Order_ViewModel.OrderType), (int)OrderTypeEnum.CourseOrder);
-            builder.AppendFormat(" AND o.CreateTime >= '2021-09-01' ");
+            builder.AppendFormat(" AND o.CreateTime >= '{0}' ", Common.Config.NewAchievementsEnable);
             builder.AppendFormat(" AND o.OrderId NOT IN(SELECT B.OrderId FROM rb_personnel_bonus AS A INNER JOIN rb_personnel_bonusdetail AS B ON A.Id=B.BonusId WHERE A.PlanType={0} AND A.EmployeeId ={1}) ", PlanType, SaleId);
             //帐平
             builder.AppendFormat(" AND o.PreferPrice = (o.Income - o.Refund + o.DiscountMoney + o.PlatformTax) ");

Edu.Repository/User/RB_StudentRepository.cs

@@ -274,12 +274,19 @@ WHERE 1=1
                     {
                         builder.AppendFormat(" AND t.StuId IN (SELECT StuId FROM rb_student_assist WHERE AssistId={0} AND `Status`=0) ", query.CreateBy);
                     }
-                    if (query.BelongType == 4 && query.CreateIds != null && query.CreateIds.Count > 0)
+                    if (query.BelongType == 4 )
                     {
-                        string createIds = string.Join(",", query.CreateIds);
-                        if (!string.IsNullOrEmpty(createIds))
+                        if (query.CreateIds != null && query.CreateIds.Count > 0)
                         {
-                            builder.AppendFormat(" AND t.{0} IN({1}) ", nameof(RB_Student_ViewModel.CreateBy), createIds);
+                            string createIds = string.Join(",", query.CreateIds);
+                            if (!string.IsNullOrEmpty(createIds))
+                            {
+                                builder.AppendFormat(" AND t.{0} IN({1}) ", nameof(RB_Student_ViewModel.CreateBy), createIds);
+                            }
+                        }
+                        else
+                        {
+                            builder.AppendFormat(" AND t.{0} IN({}) ", nameof(RB_Student_ViewModel.CreateBy), query.CreateBy);
                         }
                     }
                 }