提交代码

Mall.WebApi/Controllers/Education/AppletEducationController.cs

@@ -1869,27 +1869,31 @@ namespace Mall.WebApi.Controllers.Education
                 }
 
                 List<object> fileGroup = new List<object>();
-                foreach (var item in fileList.GroupBy(x => x.Type))
+
+                for (int i = 2; i <= 1; i--)
                 {
                     List<object> fileObjectList = new List<object>();
-                    foreach (var itemGroup in fileList.Where(x=>x.Type==item.Key).GroupBy(x => x.GroupId))
+                    foreach (var itemGroup in fileList.Where(x => x.Type == i).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()
+                            Type = i,
+                            FileList = fileList.Where(x => x.GroupId == itemGroup.Key && x.Type == i).ToList()
                         });
                     }
-
                     fileGroup.Add(new
                     {
-                        item.Key,
-                       // groupList = group.Where(x => x.Type == item.Key).ToList(),
-                        groupList=  fileObjectList
+                        Key = i,
+                        // groupList = group.Where(x => x.Type == item.Key).ToList(),
+                        groupList = fileObjectList
                     });
                 }
+                //foreach (var item in fileList.GroupBy(x => x.Type))
+                //{
+
+                //}
 
                 var data = new
                 {