页面修改

Edu.Module.User/StudentModule.cs

@@ -1661,7 +1661,14 @@ namespace Edu.Module.User
             {
                 foreach (var item in list)
                 {
-
+                    result.Add(new
+                    {
+                        item.OrderId,
+                        item.ClassName,
+                        item.CourseName,
+                        item.GuestName,
+                        item.GuestId,
+                    });
                 }
             }
             return result;

Edu.Repository/Sell/RB_Order_GuestRepository.cs

@@ -912,7 +912,10 @@ WHERE  1=1 AND A.Status=0 AND class.Status=0 AND class.ClassStatus <>4  AND b.Or
             if (demodel.IsImmediatelyGraduate == 1)
             {
                 builder.AppendFormat(" AND A.GuestState<>7 AND (A.TotalHours-A.CompleteHours)<=100 ");
-                builder.AppendFormat(" AND(st.CreateBy = {0} OR  EXISTS(SELECT 1 FROM rb_student_assist WHERE StuId = st.StuId AND AssistId = {0})) ", demodel.CreateBy);
+                if (demodel.CreateBy > 0)
+                {
+                    builder.AppendFormat(" AND(st.CreateBy = {0} OR  EXISTS(SELECT 1 FROM rb_student_assist WHERE StuId = st.StuId AND AssistId = {0})) ", demodel.CreateBy);
+                }
             }
             builder.AppendFormat($@" order by A.{nameof(RB_Order_Guest_Extend.Id)} desc");
             var list= GetPage<RB_Order_Guest_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();

Edu.WebApi/Controllers/User/UserCenterController.cs

@@ -3378,7 +3378,9 @@ namespace Edu.WebApi.Controllers.User
         public ApiResult MyContract()
         {
             var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
-            var list = studentModule.GetContractNotModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, base.UserInfo.Id);
+            var userId = 0;
+            //userId = base.UserInfo.Id;
+            var list = studentModule.GetContractNotModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, userId);
             pageModel.PageData = list;
             pageModel.Count = rowsCount;
             return ApiResult.Success(data: pageModel);
@@ -3391,7 +3393,9 @@ namespace Edu.WebApi.Controllers.User
         public ApiResult MyPay()
         {
             var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
-            var list = studentModule.GetOrderNotModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, base.UserInfo.Id);
+            var userId = 0;
+            //userId = base.UserInfo.Id;
+            var list = studentModule.GetOrderNotModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, userId);
             pageModel.PageData = list;
             pageModel.Count = rowsCount;
             return ApiResult.Success(data: pageModel);
@@ -3405,7 +3409,9 @@ namespace Edu.WebApi.Controllers.User
         public ApiResult TodayFollow()
         {
             var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
-            var list = studentModule.GetTodayFollowStudentModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, base.UserInfo.Id);
+            var userId = 0;
+            //userId = base.UserInfo.Id;
+            var list = studentModule.GetTodayFollowStudentModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, userId);
             pageModel.PageData = list;
             pageModel.Count = rowsCount;
             return ApiResult.Success(data: pageModel);
@@ -3417,8 +3423,10 @@ namespace Edu.WebApi.Controllers.User
         /// <returns></returns>
         public ApiResult GraduateStudent()
         {
+            var userId = 0;
+            //userId = base.UserInfo.Id;
             var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
-            var list = studentModule.GetStraightwayGraduateStudentModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, base.UserInfo.Id);
+            var list = studentModule.GetStraightwayGraduateStudentModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, userId);
             pageModel.PageData = list;
             pageModel.Count = rowsCount;
             return ApiResult.Success(data: pageModel);
@@ -3450,7 +3458,8 @@ namespace Edu.WebApi.Controllers.User
             {
                 query.QIds = id.ToString();
             }
-            query.CreateBy = base.UserInfo.Id;
+            query.CreateBy = 0;
+            //query.CreateBy = base.UserInfo.Id;
             var list = educationReceiptModule.GetEducationReceiptPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             pageModel.PageData = list;
             pageModel.Count = rowsCount;