|
@@ -631,8 +631,10 @@ namespace TEAMModelOS.SDK
|
|
|
|
|
|
//Key:ClassNo_gradeId Value:ClassId 存放教室no及id的變數
|
|
|
Dictionary<string, (string classId, string className, string periodId, string gradeId, int year)> classNoId = new Dictionary<string, (string classId, string className, string periodId, string gradeId, int year)>();
|
|
|
+ List<Class> classes = new List<Class>();
|
|
|
foreach (var classInfo in classInfos)
|
|
|
{
|
|
|
+ classes.Add(classInfo.Value);
|
|
|
string classGradeId = classInfo.Value.gradeId;
|
|
|
int classYear = classInfo.Value.year;
|
|
|
classNoId.Add(classInfo.Value.no + "_" + classYear,
|
|
@@ -869,6 +871,12 @@ namespace TEAMModelOS.SDK
|
|
|
{
|
|
|
student.periodId = stud.Value.periodId;
|
|
|
}
|
|
|
+ if (!string.IsNullOrWhiteSpace(student.classId)) {
|
|
|
+ var clazz = classes.FindAll(x => x.id.Equals(student.classId));
|
|
|
+ if (clazz.IsNotEmpty()) {
|
|
|
+ student.graduate = clazz[0].graduate;
|
|
|
+ }
|
|
|
+ }
|
|
|
if (!isUpPwDone)
|
|
|
{
|
|
|
student.pw = stud.Value.pw;
|