|
@@ -428,18 +428,21 @@ namespace TEAMModelOS.Controllers.Client
|
|
|
if (statusNow.Equals("join")) //成為老師的才放入
|
|
|
{
|
|
|
var schoolJson = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync($"{obj.GetProperty("schoolId")}", new PartitionKey("Base"));
|
|
|
- var school = await JsonDocument.ParseAsync(schoolJson.ContentStream);
|
|
|
- schoolExtobj = new GetTeacherInfoApiSchool();
|
|
|
- schoolExtobj.schoolId = Convert.ToString(obj.GetProperty("schoolId"));
|
|
|
- schoolExtobj.name = Convert.ToString(school.RootElement.GetProperty("name"));
|
|
|
- schoolExtobj.status = Convert.ToString(obj.GetProperty("status"));
|
|
|
- schoolExtobj.picture = Convert.ToString(school.RootElement.GetProperty("picture"));
|
|
|
- schools.Add(schoolExtobj);
|
|
|
- var sctch = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(id, new PartitionKey($"Teacher-{obj.GetProperty("schoolId")}"));
|
|
|
- if (sctch.Status == 200 && sctch != null && sctch.ContentStream != null)
|
|
|
+ if(schoolJson.Status.Equals(StatusCodes.Status200OK))
|
|
|
{
|
|
|
- var jsonDoc = await JsonDocument.ParseAsync(sctch.ContentStream);
|
|
|
- SchoolTeacher schoolTeacher = jsonDoc.RootElement.ToObject<SchoolTeacher>();
|
|
|
+ var school = await JsonDocument.ParseAsync(schoolJson.ContentStream);
|
|
|
+ schoolExtobj = new GetTeacherInfoApiSchool();
|
|
|
+ schoolExtobj.schoolId = Convert.ToString(obj.GetProperty("schoolId"));
|
|
|
+ schoolExtobj.name = Convert.ToString(school.RootElement.GetProperty("name"));
|
|
|
+ schoolExtobj.status = Convert.ToString(obj.GetProperty("status"));
|
|
|
+ schoolExtobj.picture = Convert.ToString(school.RootElement.GetProperty("picture"));
|
|
|
+ schools.Add(schoolExtobj);
|
|
|
+ var sctch = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(id, new PartitionKey($"Teacher-{obj.GetProperty("schoolId")}"));
|
|
|
+ if (sctch.Status.Equals(StatusCodes.Status200OK) && sctch != null && sctch.ContentStream != null)
|
|
|
+ {
|
|
|
+ var jsonDoc = await JsonDocument.ParseAsync(sctch.ContentStream);
|
|
|
+ SchoolTeacher schoolTeacher = jsonDoc.RootElement.ToObject<SchoolTeacher>();
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|