zhouj1203@hotmail.com 1 year ago
parent
commit
2d1faa593f

+ 9 - 2
TEAMModelOS.FunctionV4/CosmosDB/TriggerExam.cs

@@ -1959,14 +1959,21 @@ namespace TEAMModelOS.FunctionV4
                         }
                         JsonElement itemJson = JsonDocument.Parse(new MemoryStream(Encoding.UTF8.GetBytes(index_item_json.Content.ToString()))).RootElement;
                         itemJson.TryGetProperty("exercise", out JsonElement exercise);
-                        itemJson.TryGetProperty("pid", out JsonElement pid);
+                        //itemJson.TryGetProperty("pid", out JsonElement pid);
                         var item_json = exercise.ToObject<Exercise>();
                         //JObject keys = JObject.Parse(index_item_json.Content.ToString());
                         string type = item_json.type;
                         int level = item_json.level;
                         var knowledge = item_json.knowledges;
                         //string pid = keys.Value<string>("pid");
-                        itemInfos.Add((id, pid.ToString(), level, type, knowledge));
+                        if (itemJson.TryGetProperty("pid", out JsonElement pid))
+                        {
+                            itemInfos.Add((id, pid.ToString(), level, type, knowledge));
+                        }
+                        else {
+                            itemInfos.Add((id, "", level, type, knowledge));
+                        }
+                        
                     }
 
                     /* double[] point = StringHelper.ListTodouble(result.paper.point);

+ 1 - 1
TEAMModelOS/Controllers/Common/ExamController.cs

@@ -995,7 +995,7 @@ namespace TEAMModelOS.Controllers
                         }
                     }
                 }
-
+                examClassResults = examClassResults.Where(c => c.studentIds.Contains(userId)).ToList();
                 ExamClassResult classResult = new ExamClassResult();
                /* List<PaperSimple> standerAnswers = new List<PaperSimple>();
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIterator(