瀏覽代碼

[API-Student]StudentManage API Read調整學籍學制的回傳。(#207)

Mickey 4 年之前
父節點
當前提交
d369fdfc9d
共有 1 個文件被更改,包括 21 次插入3 次删除
  1. 21 3
      TEAMModelOS/Controllers/School/StudentController.cs

+ 21 - 3
TEAMModelOS/Controllers/School/StudentController.cs

@@ -597,6 +597,24 @@ namespace TEAMModelOS.Controllers
                             {
                                 JsonElement stud = studs.Current;
                                 string id = stud.GetProperty("id").GetString();
+                                string no = stud.GetProperty("no").GetString();
+                                string classId = null, gradeId = null, periodId = null;
+                                if (classroom.TryGetProperty("id", out var tmpClassId)
+                                    && !string.IsNullOrWhiteSpace(tmpClassId.GetString()))
+                                {
+                                    classId = tmpClassId.GetString();
+                                }
+                                if (classroom.TryGetProperty("gradeId", out var tmpGrageId) 
+                                    && !string.IsNullOrWhiteSpace(tmpGrageId.GetString()))
+                                {
+                                    gradeId = tmpGrageId.GetString();
+                                }
+                                
+                                if (classroom.TryGetProperty("periodId", out var tmpPeriodId)
+                                   && !string.IsNullOrWhiteSpace(tmpPeriodId.GetString()))
+                                {
+                                    periodId = tmpPeriodId.GetString();
+                                }
                                 //整理出前端所需的資訊
                                 var tmp = listStudent
                                     .Where(o => o.id.Equals(id, StringComparison.Ordinal))
@@ -608,9 +626,9 @@ namespace TEAMModelOS.Controllers
                                             o.pic,
                                             o.year,
                                             no = stud.GetProperty("no").GetString(),
-                                            gradeId = classroom.GetProperty("gradeId").GetString(),
-                                            classId = classroom.GetProperty("id").GetString(),
-                                            periodId = classroom.GetProperty("periodId").GetString()
+                                            gradeId,
+                                            classId,
+                                            periodId
                                         });
                                 ret.AddRange(tmp);
                                 //刪除已整理完的ID