CrazyIter_Bin преди 1 година
родител
ревизия
3b696fabbd
променени са 1 файла, в които са добавени 20 реда и са изтрити 0 реда
  1. 20 0
      TEAMModelOS.SDK/Models/Service/GroupListService.cs

+ 20 - 0
TEAMModelOS.SDK/Models/Service/GroupListService.cs

@@ -17,6 +17,7 @@ using System.Net.Http;
 using DocumentFormat.OpenXml.Drawing.Charts;
 using System.Reflection;
 using TEAMModelOS.SDK.Models.Service;
+using OpenXmlPowerTools;
 
 
 namespace TEAMModelOS.SDK
@@ -163,8 +164,27 @@ namespace TEAMModelOS.SDK
                 }
                 List<CourseGroupList> courseGroupLists = new List<CourseGroupList>();
                 _coreAPIHttpService.check=false;
+                groupIds= groupIds.ToHashSet().ToList();
                 var groupListDatas = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, groupIds.ToHashSet().ToList(), school);
 
+                if (groupIds.IsNotEmpty()) {
+                    string privateGrouplistSQL = $"select value c from c where c.creatorId={tmdid} and c.id not in ({string.Join(",", groupIds.Select(x=>$"'{x}'"))})";
+                    var result =  await client.GetContainer(Constant.TEAMModelOS, Constant.Teacher).GetList<RGroupList>(privateGrouplistSQL, "GroupList");
+                    if (result.list.IsNotEmpty()) {
+                        CourseGroupList courseGroupList = new CourseGroupList
+                        {
+                            scope="private",
+                            id="default",
+                            name="default"
+                        };
+                        foreach (var data in result.list) {
+                            HashSet<string> groupName = data.members.Where(x => !string.IsNullOrEmpty(x.groupName)).Select(y => y.groupName).ToHashSet();
+                            GroupListGrp groupListGrp = new GroupListGrp(data, groupName);
+                            groupListGrp.teachType="teacher";
+                            courseGroupList.groups.Add(groupListGrp);
+                        }
+                    }
+                }
                 foreach (var z in teahcerCourses)
                 {
                     CourseGroupList courseGroupList = new CourseGroupList