Browse Source

后端——代码调整

XW 1 năm trước cách đây
mục cha
commit
ef0cb561a4

+ 2 - 2
TEAMModelOS.SDK/Models/Service/Common/ActivityService.cs

@@ -561,8 +561,8 @@ namespace TEAMModelOS.SDK
               
             //先获取邀请制的
             string sqlInvite = $"select value c from c join t in c.inviteTeachers where   t.id='{tmdid}' and c.pk='ActivityTeacher'";
-            var result = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Common).GetList<ActivityTeacher>(sqlInvite);
-            inviteActivityIds= result.list.Select(z => z.id).ToHashSet();
+            var result = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher).GetList<ActivityTeacher>(sqlInvite);
+            inviteActivityIds= result.list.Select(z => z.activityId).ToHashSet();
             if (inviteActivityIds.Count>0)
             {
                 string sqlActivity = $"select value c from c  where c.id in ({string.Join(",", inviteActivityIds.Select(z => $"'{z}'"))}) {yearSql} ";

+ 1 - 0
TEAMModelOS/Controllers/Common/ActivityController.cs

@@ -1187,6 +1187,7 @@ namespace TEAMModelOS.Controllers
                                             }
                                         }
                                         var teachers = activityTeacher.inviteTeachers.FindAll(z => z.school.Equals(school));
+                                        activityTeacher.activityId=$"{_activityId}";
                                         await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher).UpsertItemAsync(activityTeacher, new PartitionKey($"ActivityTeacher-{_activityId}"));
                                         return Ok(new { inviteTeachers = teachers, inviteTeachersInvalid, removeTeachersInvalid });
                                     }