marking
/
Learn.Archives
19
0
Fork 0
Code Pull Requests Actions Releases Activity

Compare commits

base: marking:3832ecb8bb8650bd937092069f8b2669f8910b0e
Branches Tags
marking:master
marking:dev
marking:staging
..
compare: marking:d323635ad13e2f6869741f7b0245c41f36b5e09c
Branches Tags
marking:master
marking:dev
marking:staging

No commits in common. "3832ecb8bb8650bd937092069f8b2669f8910b0e" and "d323635ad13e2f6869741f7b0245c41f36b5e09c" have entirely different histories.
3832ecb8bb ... d323635ad1

2 changed files with 1 additions and 2 deletions
Show Stats Expand all files Collapse all files

1
Learn.Archives.API/Controllers/ExamClassInfoController.cs
View File

@ -59,7 +59,6 @@ namespace Learn.Archives.API.Controllers
var exam = await examService.GetByIdAsync(dto.eId); var exam = await examService.GetByIdAsync(dto.eId);
if (exam == null ) Oh.ModelError("为传入有效的数据"); if (exam == null ) Oh.ModelError("为传入有效的数据");
var dataList = await accessor.ParsingExcelAsync<ImportExamInfoError>(); var dataList = await accessor.ParsingExcelAsync<ImportExamInfoError>();
dataList= dataList.Where(s=>!string.IsNullOrEmpty(s.School)).ToArray();
if (dataList == null || dataList.Count() == 0) if (dataList == null || dataList.Count() == 0)
Oh.ModelError("导入失败：无有效数据"); Oh.ModelError("导入失败：无有效数据");

2
Learn.Archives.API/Controllers/StudentController.cs
View File

@ -360,7 +360,6 @@ namespace Learn.Archives.API.Controllers
public async Task<IActionResult> ImportUpdateStudent(IFormFile? file) public async Task<IActionResult> ImportUpdateStudent(IFormFile? file)
{ {
var dataList = await _httpContextAccessor.ParsingExcelAsync<StudentInfoImportError>(); var dataList = await _httpContextAccessor.ParsingExcelAsync<StudentInfoImportError>();
dataList = dataList.Where(s => !string.IsNullOrEmpty(s.School)).ToArray();
if (dataList == null || dataList.Length == 0) if (dataList == null || dataList.Length == 0)
Oh.ModelError("导入失败：无有效数据"); Oh.ModelError("导入失败：无有效数据");
@ -495,6 +494,7 @@ namespace Learn.Archives.API.Controllers
.IgnoreColumns(ignoreAllNullColumns: true, ignoreAllDefaultValue: true) .IgnoreColumns(ignoreAllNullColumns: true, ignoreAllDefaultValue: true)
.WhereColumns(it => new { it.Id }) .WhereColumns(it => new { it.Id })
.ExecuteCommandAsync(); .ExecuteCommandAsync();
Oh.Error("需要测试");
return Ok(); return Ok();
} }