提交代码

Mall.WebApi/Controllers/Education/AppletEducationController.cs

@@ -1871,11 +1871,23 @@ namespace Mall.WebApi.Controllers.Education
                 List<object> fileGroup = new List<object>();
                 foreach (var item in group.GroupBy(x => x.Type))
                 {
-                    fileGroup.Add(new
+                    List<object> fileObjectList = new List<object>();
+                    foreach (var itemGroup in fileList.Where(x=>x.Type==item.Key).GroupBy(x => x.GroupId))
                     {
+                        fileObjectList.Add(new
+                        {
+                            Name = group.Where(x => x.Id == itemGroup.Key).FirstOrDefault()?.Name ?? "默认",
+                            Id = itemGroup.Key,
+                            Type = item.Key,
+                            FileList= fileList.Where(x=>x.GroupId==itemGroup.Key&&x.Type==item.Key).ToList()
+                        });
+                    }
 
+                    fileGroup.Add(new
+                    {
                         item.Key,
-                        groupList = group.Where(x => x.Type == item.Key).ToList()
+                       // groupList = group.Where(x => x.Type == item.Key).ToList(),
+                        groupList=  fileObjectList
                     });
                 }