Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/Controllers/Client/HiTAControlller.cs

@@ -351,7 +351,7 @@ namespace TEAMModelOS.Controllers.Client
                     }
                     ////學校分派給老師的空間
                     int GsizeFromSchool = 0;
-                    string querySizeFromSchool = $"SELECT sum(c.size) as size FROM c WHERE c.pk = 'Teacher' AND c.id = {id}";
+                    string querySizeFromSchool = $"SELECT sum(c.size) as size FROM c WHERE c.pk = 'Teacher' AND c.id = '{id}'";
                     await foreach (var item in clientc.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIterator(querySizeFromSchool, requestOptions: new QueryRequestOptions() { }))
                     {
                         var json = await JsonDocument.ParseAsync(item.ContentStream);

TEAMModelOS/Controllers/Normal/ArtSettingController.cs

@@ -76,8 +76,8 @@ namespace TEAMModelOS.Controllers
                 List<School> schools = new List<School>();
                 School schoolHbcn = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemAsync<School>("hbcn", new PartitionKey("Base"));
                 schools.Add(schoolHbcn);
-                if (!string.IsNullOrWhiteSpace("_schoolCode")) {
-                    School schoolSelf = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemAsync<School>("hbcn", new PartitionKey("Base"));
+                if (!string.IsNullOrWhiteSpace($"{_schoolCode}") && !$"{_schoolCode}".Equals("hbcn")) {
+                    School schoolSelf = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemAsync<School>($"{_schoolCode}", new PartitionKey("Base"));
                     schools.Add(schoolSelf);
                 }
                 List<dynamic> papersData = new List<dynamic>();
@@ -103,6 +103,7 @@ namespace TEAMModelOS.Controllers
                                 {
                                     papersData.Add(new
                                     {
+                                        schoolId = school.id,
                                         x.id,
                                         x.name,
                                         x.blob,
@@ -120,7 +121,6 @@ namespace TEAMModelOS.Controllers
                                 }
                             }
                         });
-                      
                     }
                 }
                 return Ok(new { status = 0, papers = papersData });