diff --git a/Keps.WinForms/Infrastructure/ExcelEpplusReader.cs b/Keps.WinForms/Infrastructure/ExcelEpplusReader.cs index 563bfc4..d0c80cf 100644 --- a/Keps.WinForms/Infrastructure/ExcelEpplusReader.cs +++ b/Keps.WinForms/Infrastructure/ExcelEpplusReader.cs @@ -44,6 +44,13 @@ namespace Keps.WinForms.Infrastructure { throw new InvalidOperationException("먼저 Open을 호출해야 합니다."); } + + if(_package.Workbook.Worksheets == null || _package.Workbook.Worksheets.Count == 0) + { + throw new InvalidOperationException( + "엑셀 시트를 읽을 수 없습니다. 파일이 Strict Open XML 형식이면 일반 Excel 통합 문서(.xlsx)로 다시 저장한 뒤 시도하세요." + ); + } foreach (ExcelWorksheet worksheet in _package.Workbook.Worksheets) { diff --git a/Keps.WinForms/Services/ExcelImportService.cs b/Keps.WinForms/Services/ExcelImportService.cs index 3a52456..0e69043 100644 --- a/Keps.WinForms/Services/ExcelImportService.cs +++ b/Keps.WinForms/Services/ExcelImportService.cs @@ -311,27 +311,21 @@ namespace Keps.WinForms.Services using (SqlConnection connection = _connectionFactory.Open()) { - try + using (SqlCommand deleteCommand = new SqlCommand("DELETE FROM cand_name WHERE ele_ym = @eleYm", connection)) { - using (SqlCommand deleteCommand = new SqlCommand("DELETE FROM cand_name WHERE ele_ym = @eleYm", connection)) - { - deleteCommand.Parameters.AddWithValue("@eleYm", electionYear); - deleteCommand.ExecuteNonQuery(); - } - - for (int i = 0; i < candidateNames.Count; i++) - { - using (SqlCommand insertCommand = new SqlCommand("INSERT INTO cand_name(ele_ym, title, cand_no, cand_name, 당이름) VALUES(@eleYm, @eleYm, @candNo, @candName, @candName)", connection)) - { - insertCommand.Parameters.AddWithValue("@eleYm", electionYear); - insertCommand.Parameters.AddWithValue("@candNo", (i + 1).ToString()); - insertCommand.Parameters.AddWithValue("@candName", candidateNames[i]); - insertCommand.ExecuteNonQuery(); - } - } + deleteCommand.Parameters.AddWithValue("@eleYm", electionYear); + deleteCommand.ExecuteNonQuery(); } - catch + + for (int i = 0; i < candidateNames.Count; i++) { + using (SqlCommand insertCommand = new SqlCommand("INSERT INTO cand_name(ele_ym, title, cand_no, cand_name, 당이름) VALUES(@eleYm, @eleYm, @candNo, @candName, @candName)", connection)) + { + insertCommand.Parameters.AddWithValue("@eleYm", electionYear); + insertCommand.Parameters.AddWithValue("@candNo", (i + 1).ToString()); + insertCommand.Parameters.AddWithValue("@candName", candidateNames[i]); + insertCommand.ExecuteNonQuery(); + } } } }