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

Edu.Model/ViewModel/User/RB_Student_ViewModel.cs

@@ -10,6 +10,11 @@ namespace Edu.Model.ViewModel.User
     [Serializable]
     public class RB_Student_ViewModel : Entity.User.RB_Student
     {
+        /// <summary>
+        /// 学生Ids
+        /// </summary>
+        public string StuIds { get; set; }
+
         /// <summary>
         /// 创建人姓名
         /// </summary>

Edu.Repository/Sell/RB_OrderRepository.cs

@@ -193,7 +193,7 @@ ORDER BY {orderBy}
                 {
                     if (demodel.Q_OrderState == 1)
                     {
-                        where += $@" and o.{nameof(RB_Order_ViewModel.OrderState)} in(1,2)";
+                        where += $@" and o.{nameof(RB_Order_ViewModel.OrderState)} in(1,2,4)";
                     }
                     else if (demodel.Q_OrderState == 2)
                     {

Edu.Repository/User/RB_StudentRepository.cs

@@ -74,6 +74,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.AreaId), query.AreaId);
                 }
+                if (!string.IsNullOrEmpty(query.StuIds))
+                {
+                    builder.AppendFormat(" AND t.{0} in({1}) ", nameof(RB_Student_ViewModel.StuId), query.StuIds);
+                }
             }
             return Get<RB_Student_ViewModel>(builder.ToString(), parameters).ToList();
         }

Edu.WebApi/Controllers/Customer/B2BCustomerController.cs

@@ -138,6 +138,10 @@ namespace Edu.WebApi.Controllers.Customer
         {
             var CustomerId = base.ParmJObj.GetInt("CustomerId");
             var data = customerModule.GetCustomerModule(CustomerId);
+            if (data!=null && data.CreateBy > 0)
+            {
+                data.CreateByName = UserReidsCache.GetUserLoginInfo(data.CreateBy)?.AccountName ?? "";
+            }
             return ApiResult.Success(data: data);
         }