diff --git a/Server/Git/XlsxToJson.cs b/Server/Git/XlsxToJson.cs index 552a641..9a6e4b7 100644 --- a/Server/Git/XlsxToJson.cs +++ b/Server/Git/XlsxToJson.cs @@ -29,12 +29,22 @@ namespace Server.Git break; case "client": clientSheetList.Add(sheets[m].name, sheets[m].dicViewer); - Console.WriteLine("client : " + sheets[m].name); break; case "all": //수정할것 이렇게 작업되면 데이터가 2개로 나눠지는것이 아닌 한개의 데이터가 중복으로 제거됨. string name = sheets[m].name; - Dictionary> clientSheet = sheets[m].dicViewer; + Dictionary> serverSheet = new Dictionary>(sheets[m].dicViewer); + Dictionary> clientSheet = new Dictionary>(sheets[m].dicViewer); + for (int i = 1; i < sheets[m].dataEnum.Count; i++) + { + if (sheets[m].dataEnum[i] == "client") + { + foreach (var item in serverSheet) + { + item.Value.Remove(sheets[m].variable[i]); + } + } + } for (int i = 1; i < sheets[m].dataEnum.Count; i++) { if (sheets[m].dataEnum[i] == "server")