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

Edu.WebApi/Controllers/Customer/CustomerCommissionController.cs

@@ -422,9 +422,15 @@ namespace Edu.WebApi.Controllers.Course
                 return ApiResult.Failed("暂无个人直客数据");
             }
             List<object> financeList = new List<object>();
-            foreach (var item in list.Where(x => x.OrderSourceType == StuCreateTypeEnum.EmployeeInput).GroupBy(x => x.SchoolId))//先区分出校区
+            //foreach (var item in list.Where(x => x.OrderSourceType == StuCreateTypeEnum.EmployeeInput).GroupBy(x => x.SchoolId))//先区分出校区
+            //{
+            //    foreach (var deptItem in list.Where(x => x.SchoolId == item.Key && x.OrderSourceType == StuCreateTypeEnum.EmployeeInput).GroupBy(x => x.UserDept))//区分出同一个校区不同部门
+            //    {
+            var schoolGroupList = list.GroupBy(x => x.SchoolId)?.ToList();//.Where(x => x.OrderSourceType == StuCreateTypeEnum.EmployeeInput)
+            foreach (var item in schoolGroupList)//先区分出校区
             {
-                foreach (var deptItem in list.Where(x => x.SchoolId == item.Key && x.OrderSourceType == StuCreateTypeEnum.EmployeeInput).GroupBy(x => x.UserDept))//区分出同一个校区不同部门
+                var deptGroupList = list.Where(x => x.SchoolId == item.Key ).GroupBy(x => x.UserDept)?.ToList();//&& x.OrderSourceType == StuCreateTypeEnum.EmployeeInput
+                foreach (var deptItem in deptGroupList)//区分出同一个校区不同部门
                 {
                     var tempList = list.Where(x => x.SchoolId == item.Key && x.UserDept == deptItem.Key);
                     if (tempList != null && tempList.Any())