diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..81c5fcb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,25 @@
+# ---> Java
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
diff --git a/idcproject/WebContent/jsp/client/IdcClientDBList.jsp b/idcproject/WebContent/jsp/client/IdcClientDBList.jsp
index 36dc3c3..fbe2fe9 100644
--- a/idcproject/WebContent/jsp/client/IdcClientDBList.jsp
+++ b/idcproject/WebContent/jsp/client/IdcClientDBList.jsp
@@ -35,13 +35,13 @@ $(function()
 			},
 			error : function()
 			{
-				alert("수정하기 오류");	
+				alert("수정하기 오류");
 			}
 		});
 	});
 	//삭제페이지
 	$(".delBtn").click(function()
-	{		
+	{
 		var client_check = $(this).attr("client_check");
 		var client_code = $(this).attr("client_code");
 		var token = $("#token").val();
@@ -49,21 +49,21 @@ $(function()
 		{
 			var result = confirm("정말 삭제하시겠습니까?");
 			if(result == true){
-				
-				var sendData="IdcClientDBDelete.cli?";			
+
+				var sendData="IdcClientDBDelete.cli?";
 				sendData+= "code="+ client_code;
 				sendData+="&isClientDB=true";
 				sendData+="&token="+token;
 				$("#delForm").attr({method:"post",action:sendData}).submit();
-				
+
 			}else{
 				return false;
 			}
-						
+
 		}else{
 			alert("서비스를 사용 중인 고객은 삭제할 수 없습니다.");
 		}
-		
+
 	});
 	//검색하기 셀렉트
 	$("#search > li > a").click(function()
@@ -71,12 +71,12 @@ $(function()
 		$("#searchBtn").html($(this).html());
 		$("#searchOption").attr("value",$(this).attr("value"));
 	});
-	
-	//수정 버튼 눌렀을 때	
+
+	//수정 버튼 눌렀을 때
 	$(document).on("click", ".submit_btn", function(){
-		//var num = $(this).parent().parent().children().next().html();		
+		//var num = $(this).parent().parent().children().next().html();
 		//alert("나 누름");
-		
+
 		var td1 = $(this).parent().parent().parent().children();
 		var td2 = td1.next();
 		var td3 = td2.next();
@@ -87,10 +87,10 @@ $(function()
 		var td8 = td7.next();
 		var td9 = td8.next();
 		var td10 = td9.next();
-		var td11 = td10.next();		
-		
-		var code = td2.children().val();		
-		var name = td3.children().val();		
+		var td11 = td10.next();
+
+		var code = td2.children().val();
+		var name = td3.children().val();
 		var reseller = td4.children().val();
 		var phone1 = td5.children().val();
 		var phone2 = td6.children().val();
@@ -100,7 +100,7 @@ $(function()
 		//var date2 = td10.children().val();
 		var date2 = td9.children().val();
 		var note = td10.children().val();
-		
+
 		$(".code").val(code);
 		$(".name").val(name);
 		$(".reseller").val(reseller);
@@ -109,10 +109,10 @@ $(function()
 		$(".email1").val(email1);
 		$(".email2").val(email2);
 		$(".date1").val(date1);
-		$(".date2").val(date2);		
+		$(".date2").val(date2);
 		$(".note").val(note);
 	});
-	
+
 	//해지 검색인지 고객검색인지 판단
 	$(document).ready(function()
 	{
@@ -128,26 +128,26 @@ function validateTest(){
 	//return false;
 	/*
 	var code = document.getElementById("client_code").value;
-	document.getElementById("code").value = code;	
-	
+	document.getElementById("code").value = code;
+
 	var name = document.getElementById("client_name").value;
 	document.getElementById("name").value = name;
-	
+
 	var reseller = document.getElementById("client_reseller").value;
 	document.getElementById("reseller").value = reseller;
-	
+
 	var phone1 = document.getElementById("client_phone1").value;
 	document.getElementById("phone1").value = phone1;
-	
+
 	var phone2 = document.getElementById("client_phone2").value;
 	document.getElementById("phone2").value = phone2;
-	
+
 	var email1 = document.getElementById("client_email1").value;
 	document.getElementById("email1").value = email1;
-	
+
 	var email2 = document.getElementById("client_email2").value;
 	document.getElementById("email2").value = email2;
-	
+
 	var note = document.getElementById("client_note").value;
 	document.getElementById("note").value = note;
 
@@ -158,18 +158,18 @@ function validateTest(){
 }
 
 var tableToExcel = (function(){
-	
+
 	var specialElementHandlers = {
             '#bypassme': function (element, renderer) {
                 return true;
             }
 	};
-	
+
 	var uri = 'data:application/vnd.ms-excel;base64,'
 	    , template = '<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns="http://www.w3.org/TR/REC-html40"><head><!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet><x:Name>{worksheet}</x:Name><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet></x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]--><meta http-equiv="content-type" content="text/plain; charset=UTF-8"/></head><body><table>{table}</table></body></html>'
 	    , base64 = function(s) { return window.btoa(unescape(encodeURIComponent(s))) }
-	    , format = function(s, c) { return s.replace(/{(\w+)}/g, function(m, p) { return c[p]; }) }	    
-	    
+	    , format = function(s, c) { return s.replace(/{(\w+)}/g, function(m, p) { return c[p]; }) }
+
 	  return function(table, name) {
 	    if (!table.nodeType) table = document.getElementById(table)
 	    var ctx = {worksheet: name || 'Worksheet', table: table.innerHTML}
@@ -195,9 +195,9 @@ var tableToExcel = (function(){
 				<div class="row">
 					<div class="col-lg-7"><strong> * 주의 : 전화번호 수정시 ( 숫자 or - (하이픈) 이외 문자 사용금지 )</strong>
 						<input type="hidden" id="token">
-						<input id="isClientDB" type="hidden" value="${isClientDB }"> 
+						<input id="isClientDB" type="hidden" value="${isClientDB }">
 						<form id="cliForm" action="" METHOD="get">
-							<div class="input-group">							
+							<div class="input-group">
 								<div class=" input-group-btn" >
 									<a class="btn btn-outline btn-default" href="IdcClientDBWriteForm.cli" >등록</a>
 									<c:if test="${isClientDB}" >
@@ -207,7 +207,7 @@ var tableToExcel = (function(){
 										<a class="btn btn-outline btn-default" href="IdcClientDBList.cli?isClientDB=TRUE">고객리스트</a>
 									</c:if>
 									<a class="btn btn-outline btn-default" href="IdcClientAllServerList.cli">보유현황가기</a>
-									<!-- 
+									<!--
 									<a class="btn btn-outline btn-default" type="button" value="엑셀" onclick="tableToExcel('table','name')">엑셀</a>
 									 -->
 									 <a class="btn btn-outline btn-default" type="button" href="IdcClientDBListExcel.cli">엑셀</a>
@@ -235,7 +235,7 @@ var tableToExcel = (function(){
 					</div>
 				</div>
 				<!-- btn-group -->
-	   			<div class="table-responsive" id="table">	 
+	   			<div class="table-responsive" id="table">
 					<table class="table table-bordered table-hover table-striped">
 						<thead>
 						<tr>
@@ -258,19 +258,19 @@ var tableToExcel = (function(){
 						<c:if test="${isClientDB==true }">
 							<th style="text-align:center;width:50px">수정</th>
 							<th style="text-align:center;width:50px">입금</th>
-							<th style="text-align:centerwidth:50px;">삭제</th>
+							<th style="text-align:center;width:50px;">삭제</th>
 						</c:if>
 						<c:if test="${isClientDB == false }" >
 							<th style="text-align:center;">복원</th>
 						</c:if>
-						<!-- 
+						<!--
 							<td align="center">개통서</th>
 						 -->
 					</tr>
 					</thead>
-					
-					
-					
+
+
+
 <style>
 
 .table-responsive input[type="date"],
@@ -326,33 +326,35 @@ _:-ms-fullscreen.input-lg,
 }
 </style>
 
-					
+
 						<tbody>
 							<c:forEach items="${IdcClientDBList }" var="dto">
 							<tr>
-							<c:if test="${isClientDB==true }">
-								<c:choose>
-									<c:when test="${member.id eq 'khy' || member.id eq 'ko' || member.id eq 'kim.eh' || member.id eq 'leeph' || member.id eq 'choi.jh'}">									
-										<td style="text-align:center;">${dto.client_num }</td>
-										<td style="text-align:center;"><input type="hidden" id="client_code" value="${dto.client_code }"><a href="/serviceDetail.sev?client_code=${dto.client_code }">${dto.client_code }</a>
-										<!-- [<a href="/IdcDepositNonPaymentList.dep?searchContent=${dto.client_name }">청구서</a>] -->
-										</td>
-										<td style="text-align:center;"><input type="text"  id="client_name" value="${dto.client_name }" size="5"></td>
-										<td style="text-align:center;"><input type="text"  id="client_reseller" value="${dto.client_reseller }" size="4"></td>
-										<td style="text-align:center;"><input type="text"  id="client_phone1" value="${dto.client_phone1 }" size="5"></td>
-										<td style="text-align:center;"><input type="text"  id="client_phone2" value="${dto.client_phone2 }" size="5"></td>
-										<td style="text-align:center;"><input type="text"  id="client_email1" value="${dto.client_email1 }" size="5"></td>
-										<td style="text-align:center;"><input type="text"  id="client_email2" value="${dto.client_email2 }"  size="5"></td>
-										<td style="text-align:center;"><input type="date"  id="client_receive_date" value="${dto.client_receive_date}"  size="5">
-										<input type="hidden"  id="client_renew_date" value="${dto.client_renew_date}"  size="5"></td>
-										<!-- <td><input type="date"  id="client_receive_date" value="${dto.client_renew_date}"  size="5"></td> -->
-										<td style="text-align:center;"><textarea rows="1" cols="80" name="client_note">${dto.client_note }</textarea><!-- <input type="text"  id="client_note" value="${dto.client_note }">--></td>
-										<td  style="text-align:center;">
-												<!-- 
-												<button class="btn btn-outline btn-default btn-xs modify" type="button" value="수정하기"><i class="fa fa-edit"></i></button>
-												 -->
-												 <c:if test="${dto.client_code ne 'IDCJP'}">																								 
-													<form name="frm" action="IdcClientDirectUpdate.cli" method="get" onsubmit="return validateTest();">
+								<c:if test="${isClientDB==true }">
+									<c:choose>
+										<c:when test="${member.id eq 'khy' || member.id eq 'ko' || member.id eq 'park.sm' || member.id eq 'jinmingyu0313' || member.id eq 'choi.jh'}">
+											<td style="text-align:center;">${dto.client_num }</td>
+											<td style="text-align:center;"><input type="hidden" id="client_code" value="${dto.client_code }">
+												<a href="/serviceDetail.sev?client_code=${dto.client_code }">${dto.client_code }</a>
+												<!-- [<a href="/IdcDepositNonPaymentList.dep?searchContent=${dto.client_name }">청구서</a>] -->
+											</td>
+											<td style="text-align:center;"><input type="text"  id="client_name" value="${dto.client_name }" size="5"></td>
+											<td style="text-align:center;"><input type="text"  id="client_reseller" value="${dto.client_reseller }" size="4"></td>
+											<td style="text-align:center;"><input type="text"  id="client_phone1" value="${dto.client_phone1 }" size="5"></td>
+											<td style="text-align:center;"><input type="text"  id="client_phone2" value="${dto.client_phone2 }" size="5"></td>
+											<td style="text-align:center;"><input type="text"  id="client_email1" value="${dto.client_email1 }" size="5"></td>
+											<td style="text-align:center;"><input type="text"  id="client_email2" value="${dto.client_email2 }"  size="5"></td>
+											<td style="text-align:center;"><input type="date"  id="client_receive_date" value="${dto.client_receive_date}"  size="5">
+											<input type="hidden"  id="client_renew_date" value="${dto.client_renew_date}"  size="5"></td>
+											<!-- <td><input type="date"  id="client_receive_date" value="${dto.client_renew_date}"  size="5"></td> -->
+											<td style="text-align:center;">
+												<textarea rows="1" cols="80" name="client_note">${dto.client_note }</textarea>
+												<!-- <input type="text"  id="client_note" value="${dto.client_note }">-->
+											</td>
+											<td style="text-align:center;">
+												<!--<button class="btn btn-outline btn-default btn-xs modify" type="button" value="수정하기"><i class="fa fa-edit"></i></button>-->
+												 <c:if test="${dto.client_code ne 'IDCJP'}">
+													<form name="frm" action="IdcClientDirectUpdate.cli" method="post" onsubmit="return validateTest();">
 														<input type="hidden" name="code" class="code" />
 														<input type="hidden" name="name" class="name" />
 														<input type="hidden" name="reseller" class="reseller" />
@@ -361,21 +363,33 @@ _:-ms-fullscreen.input-lg,
 														<input type="hidden" name="email1" class="email1" />
 														<input type="hidden" name="email2" class="email2" />
 														<input type="hidden" name ="date1" class="date1">
-														<input type="hidden" name="date2" class="date2">																	
+														<input type="hidden" name="date2" class="date2">
 														<input type="hidden" name="note"  class="note"/>
-														<input type="hidden" name="token" class="token"/>														
+														<input type="hidden" name="token" class="token"/>
 														<input type="submit" class="btn btn-outline btn-default btn-xs submit_btn" value="수정" />
 													</form>
 												</c:if>
-										</td>
+											</td>
+										</c:when>
+										<c:when test="${member.id eq 'park.sm' || member.id eq 'jinmingyu0313' || member.id eq 'choi.jh2'}">
+												<td style="text-align:center;">${dto.client_num }</td>
+												<td style="text-align:center;"><a href="/serviceDetail.sev?client_code=${dto.client_code }">${dto.client_code }</a></td>
+												<td style="text-align:center;">${dto.client_name }</td>
+												<td style="text-align:center;">${dto.client_reseller }</td>
+												<td style="text-align:center;"></td>
+												<td style="text-align:center;"></td>
+												<td style="text-align:center;">${dto.client_email1 }</td>
+												<td style="text-align:center;">${dto.client_email2 }</td>
+												<td style="text-align:center;">${dto.client_receive_date}</td>
+												<td style="text-align:center;"><textarea rows="1" cols="80" name="client_note">${dto.client_note }</textarea></td>
 										</c:when>
 										<c:otherwise>
 												<td style="text-align:center;">${dto.client_num }</td>
 												<td style="text-align:center;"><a href="/serviceDetail.sev?client_code=${dto.client_code }">${dto.client_code }</a></td>
 												<td style="text-align:center;">${dto.client_name }</td>
 												<td style="text-align:center;">${dto.client_reseller }</td>
-												<td style="text-align:center;"><c:set var="temp_phone1" value="${fn:split(dto.client_phone1,'-')[2]}" />${temp_phone1}</td>
-												<td style="text-align:center;"><c:set var="temp_phone2" value="${fn:split(dto.client_phone2,'-')[2]}" />${temp_phone2}</td>
+												<td style="text-align:center;"></td>
+												<td style="text-align:center;"></td>
 												<td style="text-align:center;"><c:set var="temp_email1" value="${fn:substringBefore(dto.client_email1,'@')}" />${temp_email1}</td>
 												<td style="text-align:center;"><c:set var="temp_email2" value="${fn:substringBefore(dto.client_email2,'@')}" />${temp_email2}</td>
 												<td style="text-align:center;">${dto.client_receive_date}</td>
@@ -397,7 +411,7 @@ _:-ms-fullscreen.input-lg,
 										<td>${dto.client_delete_date }</td>
 									</c:if>
 									<td>${dto.client_note }</td>
-									<td align="center">
+									<td style="text-align:center;">
 										<form action="IdcClientDBDelete.cli?isClientDB=true">
 											<input type="hidden" name="token" class="token">
 											<input type="hidden" name="code" value="${dto.client_code}" size="1">
@@ -405,9 +419,8 @@ _:-ms-fullscreen.input-lg,
 										</form>
 									</td>
 								</c:if>
-								
 								<c:if test="${isClientDB == true }" >
-									<td align="center">
+									<td style="text-align:center;">
 										<form action="IdcDepositForm.dep" METHOD="get">
 											<input type="hidden" name="client_code" value="${dto.client_code}" size="1">
 											<button class="btn btn-outline btn-default btn-xs" type="submit" value="입금처리"><i class="fa fa-krw"></i></button>
@@ -432,7 +445,7 @@ _:-ms-fullscreen.input-lg,
 						<!-- 고객리스트 -->
 						<c:if test="${isClientDB }">
 							<li>
-								<a class="btn btn-outline btn-default" 
+								<a class="btn btn-outline btn-default"
 									href="IdcClientDBList.cli?searchOption=${searchOption }&searchContent=${searchContent}">
 									<i class="fa fa-angle-double-left "></i>
 								</a>
@@ -451,8 +464,8 @@ _:-ms-fullscreen.input-lg,
 							</li>
 							<c:forEach var="i" begin="${firstPage }" end="${pageCnt }">
 								<li>
-									<a class="btn btn-outline btn-defualt" 
-									href="IdcClientDBList.cli?curPage=${i}&searchOption=${searchOption }&searchContent=${searchContent}">${i}</a>	
+									<a class="btn btn-outline btn-defualt"
+									href="IdcClientDBList.cli?curPage=${i}&searchOption=${searchOption }&searchContent=${searchContent}">${i}</a>
 								</li>
 							</c:forEach>
 							<li>
@@ -468,7 +481,7 @@ _:-ms-fullscreen.input-lg,
 								</c:if>
 							</li>
 							<li>
-								<a class="btn btn-outline btn-default" 
+								<a class="btn btn-outline btn-default"
 								href="IdcClientDBList.cli?curPage=${i}&searchOption=${searchOption }&searchContent=${searchContent}">
 									<i class="fa fa-angle-double-right "></i>
 								</a>
@@ -477,7 +490,7 @@ _:-ms-fullscreen.input-lg,
 						<!-- 해지리스트 -->
 						<c:if test="${!isClientDB }">
 							<li>
-								<a class="btn btn-outline btn-default" 
+								<a class="btn btn-outline btn-default"
 									href="IdcClient_DeleteDBList.cli?searchOption=${searchOption }&searchContent=${searchContent}">
 									<i class="fa fa-angle-double-left "></i>
 								</a>
@@ -496,8 +509,8 @@ _:-ms-fullscreen.input-lg,
 							</li>
 							<c:forEach var="i" begin="${firstPage }" end="${pageCnt }">
 								<li>
-									<a class="btn btn-outline btn-defualt" 
-									href="IdcClient_DeleteDBList.cli?curPage=${i}&searchOption=${searchOption }&searchContent=${searchContent}">${i}</a>	
+									<a class="btn btn-outline btn-defualt"
+									href="IdcClient_DeleteDBList.cli?curPage=${i}&searchOption=${searchOption }&searchContent=${searchContent}">${i}</a>
 								</li>
 							</c:forEach>
 							<li>
@@ -513,7 +526,7 @@ _:-ms-fullscreen.input-lg,
 								</c:if>
 							</li>
 							<li>
-								<a class="btn btn-outline btn-default" 
+								<a class="btn btn-outline btn-default"
 								href="IdcClient_DeleteDBList.cli?curPage=${i}&searchOption=${searchOption }&searchContent=${searchContent}">
 									<i class="fa fa-angle-double-right "></i>
 								</a>
diff --git a/idcproject/WebContent/jsp/client/IdcClientDBList_OLD.jsp b/idcproject/WebContent/jsp/client/IdcClientDBList_OLD.jsp
index 23d1808..36dc3c3 100644
--- a/idcproject/WebContent/jsp/client/IdcClientDBList_OLD.jsp
+++ b/idcproject/WebContent/jsp/client/IdcClientDBList_OLD.jsp
@@ -1,6 +1,6 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="UTF-8"%>
 <%@ taglib prefix="c"  uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fn"  uri="http://java.sun.com/jsp/jstl/functions" %>
 <script src="IDC/js/setToken.js"></script>
 <script type="text/javascript">
 $(function()
@@ -235,7 +235,7 @@ var tableToExcel = (function(){
 					</div>
 				</div>
 				<!-- btn-group -->
-	   			<div class="table-responsive" id="table">	   				
+	   			<div class="table-responsive" id="table">	 
 					<table class="table table-bordered table-hover table-striped">
 						<thead>
 						<tr>
@@ -330,7 +330,9 @@ _:-ms-fullscreen.input-lg,
 						<tbody>
 							<c:forEach items="${IdcClientDBList }" var="dto">
 							<tr>
-								<c:if test="${isClientDB==true }">																
+							<c:if test="${isClientDB==true }">
+								<c:choose>
+									<c:when test="${member.id eq 'khy' || member.id eq 'ko' || member.id eq 'kim.eh' || member.id eq 'leeph' || member.id eq 'choi.jh'}">									
 										<td style="text-align:center;">${dto.client_num }</td>
 										<td style="text-align:center;"><input type="hidden" id="client_code" value="${dto.client_code }"><a href="/serviceDetail.sev?client_code=${dto.client_code }">${dto.client_code }</a>
 										<!-- [<a href="/IdcDepositNonPaymentList.dep?searchContent=${dto.client_name }">청구서</a>] -->
@@ -366,7 +368,20 @@ _:-ms-fullscreen.input-lg,
 													</form>
 												</c:if>
 										</td>
-										
+										</c:when>
+										<c:otherwise>
+												<td style="text-align:center;">${dto.client_num }</td>
+												<td style="text-align:center;"><a href="/serviceDetail.sev?client_code=${dto.client_code }">${dto.client_code }</a></td>
+												<td style="text-align:center;">${dto.client_name }</td>
+												<td style="text-align:center;">${dto.client_reseller }</td>
+												<td style="text-align:center;"><c:set var="temp_phone1" value="${fn:split(dto.client_phone1,'-')[2]}" />${temp_phone1}</td>
+												<td style="text-align:center;"><c:set var="temp_phone2" value="${fn:split(dto.client_phone2,'-')[2]}" />${temp_phone2}</td>
+												<td style="text-align:center;"><c:set var="temp_email1" value="${fn:substringBefore(dto.client_email1,'@')}" />${temp_email1}</td>
+												<td style="text-align:center;"><c:set var="temp_email2" value="${fn:substringBefore(dto.client_email2,'@')}" />${temp_email2}</td>
+												<td style="text-align:center;">${dto.client_receive_date}</td>
+												<td style="text-align:center;"><textarea rows="1" cols="80" name="client_note">${dto.client_note }</textarea></td>
+										</c:otherwise>
+									</c:choose>
 								</c:if>
 								<c:if test="${isClientDB == false }" >
 									<td>${dto.client_code }</td>