user 04-03
업체관리 목록 및 조회기능 수정
@99585dd0ab83f03dd2f61a4a779c06511e7b79f9
src/main/java/egovframework/let/itsm/company/service/impl/CompanyMngServiceImpl.java
--- src/main/java/egovframework/let/itsm/company/service/impl/CompanyMngServiceImpl.java
+++ src/main/java/egovframework/let/itsm/company/service/impl/CompanyMngServiceImpl.java
@@ -180,9 +180,11 @@
 			companyMngDAO.updateCompanyManagerSelect(companyMngVO);
 		}
 		
-		// 비고 등록
-		for(CompanyMngVO tempCompanyMngVO : companyMngVO.getCompanyRemarkList()) {
-			companyMngDAO.updateCompanyRemarkInfo(tempCompanyMngVO);
+		if(companyMngVO.getCompanyRemarkList()!=null) {
+			// 비고 등록
+			for(CompanyMngVO tempCompanyMngVO : companyMngVO.getCompanyRemarkList()) {
+				companyMngDAO.updateCompanyRemarkInfo(tempCompanyMngVO);
+			}
 		}
 	}
 	
src/main/java/egovframework/let/itsm/company/web/CompanyManageController.java
--- src/main/java/egovframework/let/itsm/company/web/CompanyManageController.java
+++ src/main/java/egovframework/let/itsm/company/web/CompanyManageController.java
@@ -115,14 +115,6 @@
 			, @ModelAttribute("companyMngVO") CompanyMngVO companyMngVO
 			, ModelMap model) throws Exception {
 		
-		// SQL Injection 취약점
-		EgovXSSUtil egovXSSUtil = new EgovXSSUtil();
-		companyMngVO.setSearchSortCnd(egovXSSUtil.makeQuery(companyMngVO.getSearchSortCnd()));
-		
-		if(companyMngVO.getPageUnit() != 10) {
-			companyMngVO.setPageUnit(companyMngVO.getPageUnit());
-		}
-		
 		/** pageing */
 		PaginationInfo paginationInfo = new PaginationInfo();
 		paginationInfo.setCurrentPageNo(companyMngVO.getPageIndex());
@@ -132,6 +124,7 @@
 		companyMngVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
 		companyMngVO.setLastIndex(paginationInfo.getLastRecordIndex());
 		companyMngVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+		
 		companyMngVO.setImsi("N"); //임시파일 제외
 		if("".equals(companyMngVO.getSearchSortCnd())) {
 			companyMngVO.setSearchSortCnd("companyId");
@@ -153,8 +146,9 @@
 		
 		List<CompanyMngVO> companyMngList = companyMngService.selectCompanyMngList(companyMngVO) ;
 		int totCnt = companyMngService.selectCompanyMngListCnt(companyMngVO) ;
-		model.addAttribute("companyMngList", companyMngList);
+		
 		paginationInfo.setTotalRecordCount(totCnt);
+		model.addAttribute("companyMngList", companyMngList);
 		model.addAttribute("paginationInfo", paginationInfo);
 		
 		return "/uss/itsm/company/CompanyMngList";
src/main/java/egovframework/let/uss/umt/web/EgovUserManageController.java
--- src/main/java/egovframework/let/uss/umt/web/EgovUserManageController.java
+++ src/main/java/egovframework/let/uss/umt/web/EgovUserManageController.java
@@ -120,9 +120,7 @@
 		
 		LoginVO sessionLogin = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
 		
-		// SQL Injection 취약점
-		EgovXSSUtil egovXSSUtil = new EgovXSSUtil();
-		userSearchVO.setSearchSortCnd(egovXSSUtil.makeQuery(userSearchVO.getSearchSortCnd()));
+		
 				
 		/** EgovPropertyService */
 		if(userSearchVO.getPageUnit() != 10) {
src/main/webapp/WEB-INF/jsp/uss/itsm/company/CompanyMngList.jsp
--- src/main/webapp/WEB-INF/jsp/uss/itsm/company/CompanyMngList.jsp
+++ src/main/webapp/WEB-INF/jsp/uss/itsm/company/CompanyMngList.jsp
@@ -10,9 +10,6 @@
 	response.setDateHeader("Expires",0);   
 	if (request.getProtocol().equals("HTTP/1.1")) response.setHeader("Cache-Control", "no-cache"); 
 %> 
-<c:set var="ImgUrl" value="${pageContext.request.contextPath}/images/egovframework/com/cmm/" />
-<c:set var="CssUrl" value="${pageContext.request.contextPath}/css/egovframework/com/" />
-<c:set var="JsUrl"  value="${pageContext.request.contextPath}/js/egovframework/com/uss/ion/pwm/"/>
 <!DOCTYPE html>
 <html lang="ko">
 <head>
@@ -107,7 +104,6 @@
 			
 			var $sort_div = $("#sort_"+ searchSortCnd);
 			var ordrImg = "<img class='ordr' src='/direct/img/sort_"+imgOrdr+"_on.png' alt=''>";
-			// <img class="ordr" src="/direct/img/sort_up_img.png" style="display: none;" alt="">
 			
 			$sort_div.attr("sortOrd", searchSortOrd);
 			$sort_div.find("div img").remove();
@@ -295,8 +291,6 @@
                 <select name="searchCondition" id="searchCondition" class="select" title="검색조건선택">
                     <option value=''>전체</option>
 					<option value='1' <c:if test="${companyMngVO.searchCondition == '1'}">selected</c:if>>업체명</option>
-<%-- 					<option value='2' <c:if test="${companyMngVO.searchCondition == '2'}">selected</c:if>>업체명+</option> --%>
-<%-- 					<option value='3' <c:if test="${companyMngVO.searchCondition == '3'}">selected</c:if>>작성자</option> --%>
                 </select>
                 <input type="text" id="searchKeyword" name="searchKeyword"  value="<c:out value='${slaAutscitecVO.searchKeyword}'/>" size="25" title="검색"  onkeypress="if(event.keyCode==13) {fn_search();}"/>
                 <div class="serch_btns">
@@ -312,12 +306,6 @@
                         	<input type="text" id="companyPartnerCrnum" name="companyPartnerCrnum" maxlength="10" numberOnly value="${companyMngVO.companyPartnerCrnum}">
                        	</div>
                     </li>
-<!--                     <li> -->
-<!--                         <div class="detail_serch_title">본 문</div> -->
-<!--                         <div class="detail_term"> -->
-<!--                         	<input type="text"> -->
-<!--                        	</div> -->
-<!--                     </li> -->
                     <li>
                         <div class="detail_serch_title">대표자</div>
                         <div class="detail_term">
@@ -331,25 +319,6 @@
         <div class="list_tab_menu_wrap">
         	<input name="searchCategory" id="searchCategory" type="hidden" value="${companyMngVO.searchCategory}" />
             <ul class="nav list_tab_menu">
-<%--                 <li <c:if test="${companyMngVO.searchCategory eq ''}">class="list_tab_menu_on"</c:if>  onclick="javascript:category_search('')"> --%>
-<!--                 	<a href="#">전체</a> -->
-<!--                	</li> -->
-<%--                 <li <c:if test="${companyMngVO.searchCategory eq 'cd1'}">class="list_tab_menu_on"</c:if> onclick="javascript:category_search('cd1')"> --%>
-<!--                 	<a href="#">서버</a> -->
-<!--                	</li> -->
-<%--                 <li <c:if test="${companyMngVO.searchCategory eq 'cd2'}">class="list_tab_menu_on"</c:if> onclick="javascript:category_search('cd2')"> --%>
-<!--                 	<a href="#">네트워크</a> -->
-<!--                	</li> -->
-<%--                 <li <c:if test="${companyMngVO.searchCategory eq 'cd3'}">class="list_tab_menu_on"</c:if> onclick="javascript:category_search('cd3')"> --%>
-<!--                 	<a href="#">정보보호시스탬</a> -->
-<!--                	</li> -->
-<%--                 <li <c:if test="${companyMngVO.searchCategory eq 'cd4'}">class="list_tab_menu_on"</c:if> onclick="javascript:category_search('cd4')"> --%>
-<!--                 	<a href="#">응용프로그램</a> -->
-<!--                	</li> -->
-<%--                 <li <c:if test="${companyMngVO.searchCategory eq 'cd6'}">class="list_tab_menu_on"</c:if> onclick="javascript:category_search('cd6')"> --%>
-<!--                 	<a href="#">기타</a> -->
-<!--                	</li> -->
-               	
                	<c:forEach var="codeList" items="${companyItemCdList}" varStatus="status">
 					<li <c:if test="${companyMngVO.searchCategory eq codeList.id}">class="list_tab_menu_on"</c:if> onclick="javascript:category_search('${codeList.id}')">
                 		<a href="#">${codeList.text}</a>
@@ -403,64 +372,56 @@
 	                        	<input type="checkbox" name="all_check" id="all_check" onClick="fnCheckAll();">
 	                        	<label for="all_check"></label>
                         	</th>
-	                        <th>번호
-	                            <div class="sort" id="sort_companyId">
+	                        <th>
+	                            <div class="sort" id="sort_companyId">번호
 									<div class="sort_btn">
 										<img src="/direct/img/sort_up_img.png" alt="">
 									</div>
 								</div>
 	                        </th>
-	                        <th>대분류
-	                        	<div class="sort" id="sort_companyMainCategory">
+	                        <th>
+	                        	<div id="sort_companyMainCategory">대분류</div>
+	                        </th>
+	                        <th>
+	                        	<div id="sort_companySecondCategory">중분류</div>
+	                        </th>
+	                        <th>
+	                        	<div class="sort" id="sort_companyPartnerMutual">업체명
 									<div class="sort_btn">
 										<img src="/direct/img/sort_up_img.png" alt="">
 									</div>
 								</div>
 	                        </th>
-	                        <th>중분류
-	                        	<div class="sort" id="sort_companySecondCategory">
+	                        <th>
+	                        	<div class="sort" id="sort_companyManagerName">담당자
 									<div class="sort_btn">
 										<img src="/direct/img/sort_up_img.png" alt="">
 									</div>
 								</div>
 	                        </th>
-	                        <th>업체명
-	                        	<div class="sort" id="sort_companyPartnerMutual">
+	                        <th>
+	                        	<div class="sort" id="sort_companyManagerSpot">직위
 									<div class="sort_btn">
 										<img src="/direct/img/sort_up_img.png" alt="">
 									</div>
 								</div>
 	                        </th>
-	                        <th>담당자
-	                        	<div class="sort" id="sort_companyManagerName">
+	                        <th>
+	                        	<div class="sort" id="sort_companyManagerTel">연락처
 									<div class="sort_btn">
 										<img src="/direct/img/sort_up_img.png" alt="">
 									</div>
 								</div>
 	                        </th>
-	                        <th>직위
-	                        	<div class="sort" id="sort_companyManagerSpot">
+	                        <th>
+	                        	<div class="sort" id="sort_companyManagerEmail">이메일
 									<div class="sort_btn">
 										<img src="/direct/img/sort_up_img.png" alt="">
 									</div>
 								</div>
 	                        </th>
-	                        <th>연락처
-	                        	<div class="sort" id="sort_companyManagerTel">
-									<div class="sort_btn">
-										<img src="/direct/img/sort_up_img.png" alt="">
-									</div>
-								</div>
-	                        </th>
-	                        <th>이메일
-	                        	<div class="sort" id="sort_companyManagerEmail">
-									<div class="sort_btn">
-										<img src="/direct/img/sort_up_img.png" alt="">
-									</div>
-								</div>
-	                        </th>
-	                        <th>사업자등록번호
-	                        	<div class="sort" id="sort_companyPartnerCrnum">
+	                        <th>
+	                        	<div class="sort" id="sort_companyPartnerCrnum">사업자등록번호
 									<div class="sort_btn">
 										<img src="/direct/img/sort_up_img.png" alt="">
 									</div>
@@ -476,19 +437,20 @@
 		                        	<label for="check${status.index}"></label>
 		                        </td>
 		                        <td>
-		                        <c:if test="${companyMngVO.searchSortOrd eq 'desc' }">
-			                		<c:out value="${( paginationInfo.totalRecordCount - ((companyMngVO.pageIndex -1)*companyMngVO.pageUnit) ) - status.index }"/>
-			                	</c:if>
-			                	<c:if test="${companyMngVO.searchSortOrd eq 'asc' }">
-			                		<c:out value="${(companyMngVO.pageIndex - 1) * companyMngVO.pageUnit + status.count}"/>
-			                	</c:if>
+			                        <c:if test="${companyMngVO.searchSortOrd eq 'desc' }">
+				                		<c:out value="${( paginationInfo.totalRecordCount - ((companyMngVO.pageIndex -1)*companyMngVO.pageUnit) ) - status.index }"/>
+				                	</c:if>
+				                	<c:if test="${companyMngVO.searchSortOrd eq 'asc' }">
+				                		<c:out value="${(companyMngVO.pageIndex - 1) * companyMngVO.pageUnit + status.count}"/>
+				                	</c:if>
 		                        </td>
-		                        
+		                        <td>
 		                        <c:forEach var="codeList" items="${companyItemCdList}" varStatus="status">
 									<c:if test="${result.companyMainCategory eq codeList.id}">
-										<td>${codeList.text}</td>
+										${codeList.text}
 									</c:if>
 				                </c:forEach>
+				                </td>
 		                        <td>
 		                        	${result.companySecondCategory} 
 		                        </td>
src/main/webapp/WEB-INF/jsp/uss/itsm/company/CompanyMngView.jsp
--- src/main/webapp/WEB-INF/jsp/uss/itsm/company/CompanyMngView.jsp
+++ src/main/webapp/WEB-INF/jsp/uss/itsm/company/CompanyMngView.jsp
@@ -728,7 +728,7 @@
 											<c:forEach var="companyManagerInfo" items="${companyManagerList}" varStatus="status">
 												<tr id="${companyManagerInfo.companyManagerId}">
 													<td style="text-align:left;">
-														<ul>
+														<ul style="overflow: revert;">
 															<li>
 																<input type="radio" name="companyManagerSelect" id="manager_${status.index}" value="${companyManagerInfo.companyManagerId}" 
 																<c:if test="${companyManagerInfo.companyManagerSelect eq 1 }">
Add a comment
List