|
|
@@ -858,6 +858,7 @@ namespace TEAMModelOS.SDK
|
|
|
if (!string.IsNullOrWhiteSpace(stud.Value.no))
|
|
|
{
|
|
|
student.no = stud.Value.no;
|
|
|
+ student.irs=stud.Value.no;
|
|
|
}
|
|
|
if (!string.IsNullOrWhiteSpace(stud.Value.gender))
|
|
|
{
|
|
|
@@ -2281,6 +2282,8 @@ namespace TEAMModelOS.SDK
|
|
|
{
|
|
|
element.WriteTo(writer);
|
|
|
tmpData.no = element.Value.GetString();
|
|
|
+ //#2769 C343 学生管理--导入学生名单，IRS编号默认与座号一致
|
|
|
+ tmpData.irs=element.Value.GetString();
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -2305,26 +2308,27 @@ namespace TEAMModelOS.SDK
|
|
|
// }
|
|
|
//}
|
|
|
writer.WriteString("no", studentInfos[id].no);
|
|
|
+ //#2769 C343 学生管理--导入学生名单，IRS编号默认与座号一致
|
|
|
+ writer.WriteString("irs", studentInfos[id].no);
|
|
|
}
|
|
|
break;
|
|
|
- case bool _ when element.Name.Equals("irs", StringComparison.Ordinal):
|
|
|
- //移除座號的話會給空的
|
|
|
- if (studentInfos[id].irs != null && studentInfos[id].irs.Length == 0)
|
|
|
- {
|
|
|
- writer.WriteNull("irs");
|
|
|
- tmpData.irs = null;
|
|
|
- }
|
|
|
- else if (string.IsNullOrWhiteSpace(studentInfos[id].irs))
|
|
|
- {
|
|
|
- element.WriteTo(writer);
|
|
|
- tmpData.irs = element.Value.GetString();
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- writer.WriteString("irs", studentInfos[id].irs);
|
|
|
- }
|
|
|
- break;
|
|
|
-
|
|
|
+ //case bool _ when element.Name.Equals("irs", StringComparison.Ordinal):
|
|
|
+ // //移除座號的話會給空的
|
|
|
+ // if (studentInfos[id].irs != null && studentInfos[id].irs.Length == 0)
|
|
|
+ // {
|
|
|
+ // writer.WriteNull("irs");
|
|
|
+ // tmpData.irs = null;
|
|
|
+ // }
|
|
|
+ // else if (string.IsNullOrWhiteSpace(studentInfos[id].irs))
|
|
|
+ // {
|
|
|
+ // element.WriteTo(writer);
|
|
|
+ // tmpData.irs = element.Value.GetString();
|
|
|
+ // }
|
|
|
+ // else
|
|
|
+ // {
|
|
|
+ // writer.WriteString("irs", studentInfos[id].irs);
|
|
|
+ // }
|
|
|
+ // break;
|
|
|
case bool _ when element.Name.StartsWith("_", StringComparison.Ordinal):
|
|
|
break;
|
|
|
default:
|
|
|
@@ -2430,10 +2434,13 @@ namespace TEAMModelOS.SDK
|
|
|
await writer.DisposeAsync();
|
|
|
continue;
|
|
|
}
|
|
|
- if (!account.TryGetProperty("irs", out JsonElement _irs) || _irs.ValueKind.Equals(JsonValueKind.Undefined))
|
|
|
- {
|
|
|
- writer.WriteString("irs", studentInfos[id].irs);
|
|
|
- }
|
|
|
+ //#2769 C343 学生管理--导入学生名单，IRS编号默认与座号一致
|
|
|
+ //if (!account.TryGetProperty("irs", out JsonElement _irs) || _irs.ValueKind.Equals(JsonValueKind.Undefined))
|
|
|
+ //{
|
|
|
+ // writer.WriteString("irs", studentInfos[id].irs);
|
|
|
+ //}
|
|
|
+ writer.WriteString("irs", studentInfos[id].no);
|
|
|
+
|
|
|
//若密碼和鹽沒有更新，就把舊的資料寫回去
|
|
|
if (!isUpPwDone)
|
|
|
{
|
CrazyIter_Bin