diff --git a/Server/Git/XlsxToJson.cs b/Server/Git/XlsxToJson.cs index a0fb767..cc57e6b 100644 --- a/Server/Git/XlsxToJson.cs +++ b/Server/Git/XlsxToJson.cs @@ -24,29 +24,26 @@ namespace Server.Git switch (sheets[m].dataEnum[0]) { case "server": - serverSheetList.Add(new Sheet(sheets[m])); + serverSheetList.Add(sheets[m]); break; case "client": clientSheetList.Add(sheets[m].name, sheets[m].dicViewer); break; case "all": - //수정할것 이렇게 작업되면 데이터가 2개로 나눠지는것이 아닌 한개의 데이터가 중복으로 제거됨. - Sheet sheet = new Sheet(sheets[m]); - string name = sheet.name; - //서버는 다른곳에서 처리를 하기때문에 여기서는 add만 시켜줌. - serverSheetList.Add(new Sheet(sheets[m])); - Dictionary> clientSheet = sheet.dicViewer; - for (int i = 1; i < sheet.dataEnum.Count; i++) + string name = sheets[m].name; + Dictionary> clientSheet = new Dictionary>(sheet.dicViewer); + for (int i = 1; i < sheets[m].dataEnum.Count; i++) { - if (sheet.dataEnum[i] == "server") + if (sheets[m].dataEnum[i] == "server") { foreach (var item in clientSheet) { - item.Value.Remove(sheet.variable[i]); + item.Value.Remove(sheets[m].variable[i]); } } } clientSheetList.Add(name, clientSheet); + serverSheetList.Add(sheets[m]); break; } }