update

TEAMModelOS/Controllers/Both/GroupListController.cs

@@ -1059,22 +1059,26 @@ namespace TEAMModelOS.Controllers
                     // 取出該老師還有連結課程的名單id
                     groupIds.Append($"'{item.id}',");
                 }
-                List<RGroupList> haveTaskGroups = new List<RGroupList>();
-                if (groupIds.Length > 0)
+                if (!$"{scope}".Equals("school", StringComparison.OrdinalIgnoreCase))
                 {
-                    groupIds = groupIds.Remove(groupIds.Length - 1, 1);
-                    string courseTasksql = $"SELECT distinct b.groupId from c join b in c.schedules where b.groupId in ( {groupIds} )";
-
-                    await foreach (var item in client.GetContainer(Constant.TEAMModelOS, tbname).GetItemQueryIteratorSql<GroupId>(queryText: courseTasksql.ToString(),
-                    requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("CourseTask") }))
+                    List<RGroupList> haveTaskGroups = new List<RGroupList>();
+                    if (groupIds.Length > 0)
                     {
-                        var groupItem = groups.Find(z => z.id == item.groupId);  
-                        // 篩選出有效的名單
-                        haveTaskGroups.Add(groupItem);
+                        groupIds = groupIds.Remove(groupIds.Length - 1, 1);
+                        string courseTasksql = $"SELECT distinct b.groupId from c join b in c.schedules where b.groupId in ( {groupIds} )";
+
+                        await foreach (var item in client.GetContainer(Constant.TEAMModelOS, tbname).GetItemQueryIteratorSql<GroupId>(queryText: courseTasksql.ToString(),
+                        requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("CourseTask") }))
+                        {
+                            var groupItem = groups.Find(z => z.id == item.groupId);
+                            // 篩選出有效的名單
+                            haveTaskGroups.Add(groupItem);
+                        }
                     }
+                    groups=haveTaskGroups;
                 }
 
-                (List<RGroupList> groupsData, List<RMember> members) = await GroupListService.GetGroupListMemberInfo(_coreAPIHttpService, client, $"{type}", haveTaskGroups, tbname, _dingDing, $"{_schoolId}");
+                (List<RGroupList> groupsData, List<RMember> members) = await GroupListService.GetGroupListMemberInfo(_coreAPIHttpService, client, $"{type}", groups, tbname, _dingDing, $"{_schoolId}");
                 return Ok(new { groups = groupsData, members });
             }
             catch (CosmosException ex)