update

TEAMModelOS/Controllers/Both/CourseBaseController.cs

@@ -107,13 +107,34 @@ namespace TEAMModelOS.Controllers.Both
                                 var resultBase = await client.GetContainer(Constant.TEAMModelOS, Constant.Teacher).GetList<IdNameCode>(teacherSQLBase, $"Base");
                                 teachers = resultBase.list;
                             }
-                            courseBases.ForEach(z => {
+                            int studyYear = -1;
+                            string semesterId = string.Empty;
+                            if ($"{scope}".Equals("school")) {
+                                if (!request.TryGetProperty("year", out JsonElement _year) || !request.TryGetProperty("semesterId", out JsonElement _semesterId))
+                                {
+                                    //如果没传，则以当前时间获取学年和学期信息
+                                    School schoolBase = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReadItemAsync<School>(school, new PartitionKey("Base"));
+                                    var period = schoolBase.period.Find(x => x.id.Equals($"{_periodId}"));
+                                    (Semester currSemester, int studyYear, DateTimeOffset currSemesterDate, DateTimeOffset date, DateTimeOffset nextSemester) info = SchoolService.GetSemester(period);
+                                    semesterId = info.currSemester.id;
+                                    studyYear = info.studyYear;
+
+                                }
+                                else
+                                {
+                                    studyYear = _year.GetInt32();
+                                    semesterId=_semesterId.GetString();
+                                }
+                            }
+                            foreach (var z in courseBases) {
                                 var teacher = teachers.Find(x => x.id.Equals(z.creatorId));
-                                if (teacher!= null) {
+                                if (teacher!= null)
+                                {
                                     z.creatorName=teacher.name;
                                     z.creatorPicture=teacher.picture;
                                 }
-                            });
+
+                            }
                             return Ok(new { courseBases = courseBases.OrderByDescending(z => z._ts) });
                         }
                     case bool when $"{grant_type}".Equals("delete", StringComparison.OrdinalIgnoreCase):