Browse Source

调整全体教师。

CrazyIter_Bin 3 years ago
parent
commit
b559fc1eb7

+ 2 - 1
TEAMModelOS.SDK/Models/Cosmos/Common/GroupList.cs

@@ -55,7 +55,8 @@ namespace TEAMModelOS.SDK.Models
         public string school { get; set; }
         public string creatorId { get; set; }
         /// <summary>
-        ///研修培训名单,yxtrain 教学班teach ,行政班(学生搜寻classId动态返回)class ,教研组research,学科组(学科搜寻动态返回)subject,好友friend,管理manage,群组group等,"activity"
+        ///研修培训名单,yxtrain 教学班teach ,行政班(学生搜寻classId动态返回)class ,教研组research,学科组(学科搜寻动态返回)subject,好友friend,管理manage,群组group等,"activity",
+        ///TeacherAll 全体教师,StudentAll全体学生 TchStuAll,全体师生 动态返回
         /// </summary>
         public string type { get; set; } = "teach";
         public int year { get; set; }

+ 5 - 5
TEAMModelOS.SDK/Models/Service/GroupListService.cs

@@ -411,11 +411,11 @@ namespace TEAMModelOS.SDK
             if (classes==null || classes.Count<=0) {
                 return (members, groupLists);
             }
-            if (classes.Count == 1 && classes.First().Equals("default") && !string.IsNullOrEmpty(school))
+            if (classes.Count == 1 && classes.First().Equals("TeacherAll") && !string.IsNullOrEmpty(school))
             {
                 //默认的教研组
                 members = new List<RMember>();
-                await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryIterator<TmdInfo>(queryText: $"SELECT  value(c) FROM c ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Teacher-{school}") }))
+                await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryIterator<TmdInfo>(queryText: $"SELECT  c.id,c.name,c.picture  FROM c ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Teacher-{school}") }))
                 {
                     RMember member = new RMember
                     {
@@ -429,12 +429,12 @@ namespace TEAMModelOS.SDK
                 }
                 RGroupList groupList = new RGroupList
                 {
-                    id = "default",
-                    name = "default",
+                    id = "TeacherAll",
+                    name = "TeacherAll",
                     code = $"GroupList-{school}",
                     school = school,
                     scope = "school",
-                    type = "yxtrain",
+                    type = "TeacherAll",
                     members = members
                 };
                 groupLists = new List<RGroupList> { groupList };