Merge pull request 'staging' (#33) from staging into master

Reviewed-on: #33

Learn.Archives.API/Controllers/ExamClassInfoController.cs

@@ -343,13 +343,17 @@ namespace Learn.Archives.API.Controllers
             {
 
                 var school = await sService.GetFirstAsync(s => s.Id == schoolArr.Key);
-                var classArr = await db.Queryable<Classes>().Where(c => c.SchoolId == school.Id &&
+                var classArr = await db.Queryable<Classes>()
+                    .Where(c => c.SchoolId == school.Id &&
                         c.GradeLevel == exam.GradeLevel &&
-                    c.GraduationYear == exam.GradeYear && !c.DeleteState).ToArrayAsync();
+                        c.GraduationYear == exam.GradeYear && !c.DeleteState)
+                    .ToArrayAsync();
 
-                foreach (var classUserArr in userInfoArr.GroupBy(s => s.ClassId))
+                foreach (var classUserArr in userInfoArr.Where(s=>s.SchoolId == school.Id).GroupBy(s => s.ClassId))
                 {
-                    var classInfo = classArr.First(s => s.Id == classUserArr.Key);
+                    var classInfo = classArr.FirstOrDefault(s => s.Id == classUserArr.Key);
+                    if (classInfo is null)
+                        continue;
                     var eCInfo = new ExamClassInfo()
                     {
                         ExamId = exam.Id,

Learn.Archives.API/Controllers/StudentController.cs

@@ -137,7 +137,7 @@ namespace Learn.Archives.API.Controllers
                 res.Data.Add(item);
                 if (!exDataDic.ContainsKey(item.Id)) continue;
                 var ex = exDataDic[item.Id].First();
-                item.Status = ex.Status;
+                item.Status = ex.Status??UserStatusEnum.未录入;
                 item.ExitTime = ex.ExitTime==null? string.Empty : ex.ExitTime?.ToString("yyyy-MM-dd");
                 item.JoinTime = ex.JoinTime == null ? string.Empty : ex.JoinTime?.ToString("yyyy-MM-dd");
 

Learn.Archives.Core/Model/Student.cs

@@ -51,7 +51,7 @@ namespace Learn.Archives.Core.Model
         /// <summary>
         /// 学生状态
         /// </summary>
-        public UserStatusEnum Status { get; set; }
+        public UserStatusEnum? Status { get; set; }
 
         /// <summary>
         /// 备注