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

Edu.EducationCore/Helper/QuarzHelper.cs

@@ -474,6 +474,7 @@ namespace Edu.Education.Helper
                 Console.WriteLine("开始执行简易报表....");
                 financeModule.InsertBatchSimple_V2(100000, 2020);
                 financeModule.InsertBatchSimple_V2(100000, 2021);
+                financeModule.InsertBatchSimple_V2(100000, 2022);
                 Console.WriteLine("结束执行简易报表....");
             }
             catch (Exception ex)

Edu.Module.User/StudentStatModule.cs

@@ -143,7 +143,7 @@ namespace Edu.Module.User
                 //续费 学员介绍
                 List<object> RList2 = new List<object>();
                 List<int> Mlist = ROList.Select(x => x.Month).Distinct().OrderBy(x => x).ToList();
-                int MaxRO = ROList.Max(x => x.Month);
+                int MaxRO = ROList.Any() ? ROList.Max(x => x.Month) : 0;
                 MaxMonth = MaxMonth < MaxRO ? MaxRO : MaxMonth;
                 foreach (var month in Mlist) {
                     RList2.Add(new

Edu.WebApi/Controllers/User/StudentStatController.cs

@@ -43,7 +43,15 @@ namespace Edu.WebApi.Controllers.User
             ResultPageModel pmodel = JsonHelper.DeserializeObject<ResultPageModel>(base.RequestParm.Msg.ToString());
             RB_Student_ViewModel demodel = JsonHelper.DeserializeObject<RB_Student_ViewModel>(base.RequestParm.Msg.ToString());
             demodel.Group_Id = userInfo.Group_Id;
+            if (demodel.IsQueryMyStu == 1)
+            {
                 demodel.CreateBy = userInfo.Id;
+            }
+            else {
+                if (demodel.BelongType == 1) {
+                    demodel.BelongType = 0;//暂先查全部
+                }
+            }
 
             var list = studentStatModule.GetStudentFollowUpPageList(pmodel.PageIndex, pmodel.PageSize, out long count, demodel);
             pmodel.Count = count;