diff --git a/Server/Git/XlsxToJson.cs b/Server/Git/XlsxToJson.cs index 8220855..9d7de23 100644 --- a/Server/Git/XlsxToJson.cs +++ b/Server/Git/XlsxToJson.cs @@ -12,46 +12,46 @@ namespace Server.Git Dictionary>> clientSheetList = new Dictionary>>(); List serverSheetList = new List(); - + sheets = new List(); for (int n = 0; n < fileList.Count; n++) { ExcelManager em = new ExcelManager(fileList[n]); if (em.Play()) { - //나의 sheet가 아니라 em에 들어있는 시트만으로 처리되도록 해야함. - sheets = em.sheets; - for (int m = 0; m < sheets.Count; m++) + List parseSheet = em.sheets; + sheets.AddRange(parseSheet); + for (int m = 0; m < parseSheet.Count; m++) { - switch (sheets[m].dataEnum[0]) + switch (parseSheet[m].dataEnum[0]) { case "server": - serverSheetList.Add(sheets[m]); + serverSheetList.Add(parseSheet[m]); break; case "client": - clientSheetList.Add(sheets[m].name, sheets[m].dicViewer); + clientSheetList.Add(parseSheet[m].name, parseSheet[m].dicViewer); break; case "all": - string name = sheets[m].name; + string name = parseSheet[m].name; Dictionary> clientSheet = new Dictionary>(); - foreach (KeyValuePair> item in sheets[m].dicViewer) + foreach (KeyValuePair> item in parseSheet[m].dicViewer) { clientSheet.Add(item.Key, new Dictionary(item.Value)); } - for (int i = 1; i < sheets[m].dataEnum.Count; i++) + for (int i = 1; i < parseSheet[m].dataEnum.Count; i++) { - if (sheets[m].dataEnum[i] == "server") + if (parseSheet[m].dataEnum[i] == "server") { foreach (var item in clientSheet) { - item.Value.Remove(sheets[m].variable[i]); + item.Value.Remove(parseSheet[m].variable[i]); } } } clientSheetList.Add(name, clientSheet); - serverSheetList.Add(sheets[m]); + serverSheetList.Add(parseSheet[m]); break; } }