|
@@ -562,11 +562,11 @@ 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.Teacher).GetList<ActivityTeacher>(sqlInvite);
|
|
|
- inviteActivityIds= result.list.Select(z => z.activityId).ToHashSet();
|
|
|
+ inviteActivityIds= result.list.Where(x=>!string.IsNullOrWhiteSpace(x.activityId)).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} ";
|
|
|
- var resultActivity = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Common).GetList<TeacherActivityDto>(sqlInvite, "Activity");
|
|
|
+ var resultActivity = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Common).GetList<TeacherActivityDto>(sqlActivity, "Activity");
|
|
|
if (resultActivity.list.IsNotEmpty())
|
|
|
{
|
|
|
activities.AddRange(resultActivity.list);
|