업체관리 목록 및 조회기능 수정
@99585dd0ab83f03dd2f61a4a779c06511e7b79f9
--- 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 @@ |
| 180 | 180 |
companyMngDAO.updateCompanyManagerSelect(companyMngVO); |
| 181 | 181 |
} |
| 182 | 182 |
|
| 183 |
- // 비고 등록 |
|
| 184 |
- for(CompanyMngVO tempCompanyMngVO : companyMngVO.getCompanyRemarkList()) {
|
|
| 185 |
- companyMngDAO.updateCompanyRemarkInfo(tempCompanyMngVO); |
|
| 183 |
+ if(companyMngVO.getCompanyRemarkList()!=null) {
|
|
| 184 |
+ // 비고 등록 |
|
| 185 |
+ for(CompanyMngVO tempCompanyMngVO : companyMngVO.getCompanyRemarkList()) {
|
|
| 186 |
+ companyMngDAO.updateCompanyRemarkInfo(tempCompanyMngVO); |
|
| 187 |
+ } |
|
| 186 | 188 |
} |
| 187 | 189 |
} |
| 188 | 190 |
|
--- src/main/java/egovframework/let/itsm/company/web/CompanyManageController.java
+++ src/main/java/egovframework/let/itsm/company/web/CompanyManageController.java
... | ... | @@ -115,14 +115,6 @@ |
| 115 | 115 |
, @ModelAttribute("companyMngVO") CompanyMngVO companyMngVO
|
| 116 | 116 |
, ModelMap model) throws Exception {
|
| 117 | 117 |
|
| 118 |
- // SQL Injection 취약점 |
|
| 119 |
- EgovXSSUtil egovXSSUtil = new EgovXSSUtil(); |
|
| 120 |
- companyMngVO.setSearchSortCnd(egovXSSUtil.makeQuery(companyMngVO.getSearchSortCnd())); |
|
| 121 |
- |
|
| 122 |
- if(companyMngVO.getPageUnit() != 10) {
|
|
| 123 |
- companyMngVO.setPageUnit(companyMngVO.getPageUnit()); |
|
| 124 |
- } |
|
| 125 |
- |
|
| 126 | 118 |
/** pageing */ |
| 127 | 119 |
PaginationInfo paginationInfo = new PaginationInfo(); |
| 128 | 120 |
paginationInfo.setCurrentPageNo(companyMngVO.getPageIndex()); |
... | ... | @@ -132,6 +124,7 @@ |
| 132 | 124 |
companyMngVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); |
| 133 | 125 |
companyMngVO.setLastIndex(paginationInfo.getLastRecordIndex()); |
| 134 | 126 |
companyMngVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); |
| 127 |
+ |
|
| 135 | 128 |
companyMngVO.setImsi("N"); //임시파일 제외
|
| 136 | 129 |
if("".equals(companyMngVO.getSearchSortCnd())) {
|
| 137 | 130 |
companyMngVO.setSearchSortCnd("companyId");
|
... | ... | @@ -153,8 +146,9 @@ |
| 153 | 146 |
|
| 154 | 147 |
List<CompanyMngVO> companyMngList = companyMngService.selectCompanyMngList(companyMngVO) ; |
| 155 | 148 |
int totCnt = companyMngService.selectCompanyMngListCnt(companyMngVO) ; |
| 156 |
- model.addAttribute("companyMngList", companyMngList);
|
|
| 149 |
+ |
|
| 157 | 150 |
paginationInfo.setTotalRecordCount(totCnt); |
| 151 |
+ model.addAttribute("companyMngList", companyMngList);
|
|
| 158 | 152 |
model.addAttribute("paginationInfo", paginationInfo);
|
| 159 | 153 |
|
| 160 | 154 |
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
... | ... | @@ -120,9 +120,7 @@ |
| 120 | 120 |
|
| 121 | 121 |
LoginVO sessionLogin = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); |
| 122 | 122 |
|
| 123 |
- // SQL Injection 취약점 |
|
| 124 |
- EgovXSSUtil egovXSSUtil = new EgovXSSUtil(); |
|
| 125 |
- userSearchVO.setSearchSortCnd(egovXSSUtil.makeQuery(userSearchVO.getSearchSortCnd())); |
|
| 123 |
+ |
|
| 126 | 124 |
|
| 127 | 125 |
/** EgovPropertyService */ |
| 128 | 126 |
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
... | ... | @@ -10,9 +10,6 @@ |
| 10 | 10 |
response.setDateHeader("Expires",0);
|
| 11 | 11 |
if (request.getProtocol().equals("HTTP/1.1")) response.setHeader("Cache-Control", "no-cache");
|
| 12 | 12 |
%> |
| 13 |
-<c:set var="ImgUrl" value="${pageContext.request.contextPath}/images/egovframework/com/cmm/" />
|
|
| 14 |
-<c:set var="CssUrl" value="${pageContext.request.contextPath}/css/egovframework/com/" />
|
|
| 15 |
-<c:set var="JsUrl" value="${pageContext.request.contextPath}/js/egovframework/com/uss/ion/pwm/"/>
|
|
| 16 | 13 |
<!DOCTYPE html> |
| 17 | 14 |
<html lang="ko"> |
| 18 | 15 |
<head> |
... | ... | @@ -107,7 +104,6 @@ |
| 107 | 104 |
|
| 108 | 105 |
var $sort_div = $("#sort_"+ searchSortCnd);
|
| 109 | 106 |
var ordrImg = "<img class='ordr' src='/direct/img/sort_"+imgOrdr+"_on.png' alt=''>"; |
| 110 |
- // <img class="ordr" src="/direct/img/sort_up_img.png" style="display: none;" alt=""> |
|
| 111 | 107 |
|
| 112 | 108 |
$sort_div.attr("sortOrd", searchSortOrd);
|
| 113 | 109 |
$sort_div.find("div img").remove();
|
... | ... | @@ -295,8 +291,6 @@ |
| 295 | 291 |
<select name="searchCondition" id="searchCondition" class="select" title="검색조건선택"> |
| 296 | 292 |
<option value=''>전체</option> |
| 297 | 293 |
<option value='1' <c:if test="${companyMngVO.searchCondition == '1'}">selected</c:if>>업체명</option>
|
| 298 |
-<%-- <option value='2' <c:if test="${companyMngVO.searchCondition == '2'}">selected</c:if>>업체명+</option> --%>
|
|
| 299 |
-<%-- <option value='3' <c:if test="${companyMngVO.searchCondition == '3'}">selected</c:if>>작성자</option> --%>
|
|
| 300 | 294 |
</select> |
| 301 | 295 |
<input type="text" id="searchKeyword" name="searchKeyword" value="<c:out value='${slaAutscitecVO.searchKeyword}'/>" size="25" title="검색" onkeypress="if(event.keyCode==13) {fn_search();}"/>
|
| 302 | 296 |
<div class="serch_btns"> |
... | ... | @@ -312,12 +306,6 @@ |
| 312 | 306 |
<input type="text" id="companyPartnerCrnum" name="companyPartnerCrnum" maxlength="10" numberOnly value="${companyMngVO.companyPartnerCrnum}">
|
| 313 | 307 |
</div> |
| 314 | 308 |
</li> |
| 315 |
-<!-- <li> --> |
|
| 316 |
-<!-- <div class="detail_serch_title">본 문</div> --> |
|
| 317 |
-<!-- <div class="detail_term"> --> |
|
| 318 |
-<!-- <input type="text"> --> |
|
| 319 |
-<!-- </div> --> |
|
| 320 |
-<!-- </li> --> |
|
| 321 | 309 |
<li> |
| 322 | 310 |
<div class="detail_serch_title">대표자</div> |
| 323 | 311 |
<div class="detail_term"> |
... | ... | @@ -331,25 +319,6 @@ |
| 331 | 319 |
<div class="list_tab_menu_wrap"> |
| 332 | 320 |
<input name="searchCategory" id="searchCategory" type="hidden" value="${companyMngVO.searchCategory}" />
|
| 333 | 321 |
<ul class="nav list_tab_menu"> |
| 334 |
-<%-- <li <c:if test="${companyMngVO.searchCategory eq ''}">class="list_tab_menu_on"</c:if> onclick="javascript:category_search('')"> --%>
|
|
| 335 |
-<!-- <a href="#">전체</a> --> |
|
| 336 |
-<!-- </li> --> |
|
| 337 |
-<%-- <li <c:if test="${companyMngVO.searchCategory eq 'cd1'}">class="list_tab_menu_on"</c:if> onclick="javascript:category_search('cd1')"> --%>
|
|
| 338 |
-<!-- <a href="#">서버</a> --> |
|
| 339 |
-<!-- </li> --> |
|
| 340 |
-<%-- <li <c:if test="${companyMngVO.searchCategory eq 'cd2'}">class="list_tab_menu_on"</c:if> onclick="javascript:category_search('cd2')"> --%>
|
|
| 341 |
-<!-- <a href="#">네트워크</a> --> |
|
| 342 |
-<!-- </li> --> |
|
| 343 |
-<%-- <li <c:if test="${companyMngVO.searchCategory eq 'cd3'}">class="list_tab_menu_on"</c:if> onclick="javascript:category_search('cd3')"> --%>
|
|
| 344 |
-<!-- <a href="#">정보보호시스탬</a> --> |
|
| 345 |
-<!-- </li> --> |
|
| 346 |
-<%-- <li <c:if test="${companyMngVO.searchCategory eq 'cd4'}">class="list_tab_menu_on"</c:if> onclick="javascript:category_search('cd4')"> --%>
|
|
| 347 |
-<!-- <a href="#">응용프로그램</a> --> |
|
| 348 |
-<!-- </li> --> |
|
| 349 |
-<%-- <li <c:if test="${companyMngVO.searchCategory eq 'cd6'}">class="list_tab_menu_on"</c:if> onclick="javascript:category_search('cd6')"> --%>
|
|
| 350 |
-<!-- <a href="#">기타</a> --> |
|
| 351 |
-<!-- </li> --> |
|
| 352 |
- |
|
| 353 | 322 |
<c:forEach var="codeList" items="${companyItemCdList}" varStatus="status">
|
| 354 | 323 |
<li <c:if test="${companyMngVO.searchCategory eq codeList.id}">class="list_tab_menu_on"</c:if> onclick="javascript:category_search('${codeList.id}')">
|
| 355 | 324 |
<a href="#">${codeList.text}</a>
|
... | ... | @@ -403,64 +372,56 @@ |
| 403 | 372 |
<input type="checkbox" name="all_check" id="all_check" onClick="fnCheckAll();"> |
| 404 | 373 |
<label for="all_check"></label> |
| 405 | 374 |
</th> |
| 406 |
- <th>번호 |
|
| 407 |
- <div class="sort" id="sort_companyId"> |
|
| 375 |
+ <th> |
|
| 376 |
+ <div class="sort" id="sort_companyId">번호 |
|
| 408 | 377 |
<div class="sort_btn"> |
| 409 | 378 |
<img src="/direct/img/sort_up_img.png" alt=""> |
| 410 | 379 |
</div> |
| 411 | 380 |
</div> |
| 412 | 381 |
</th> |
| 413 |
- <th>대분류 |
|
| 414 |
- <div class="sort" id="sort_companyMainCategory"> |
|
| 382 |
+ <th> |
|
| 383 |
+ <div id="sort_companyMainCategory">대분류</div> |
|
| 384 |
+ </th> |
|
| 385 |
+ <th> |
|
| 386 |
+ <div id="sort_companySecondCategory">중분류</div> |
|
| 387 |
+ </th> |
|
| 388 |
+ <th> |
|
| 389 |
+ <div class="sort" id="sort_companyPartnerMutual">업체명 |
|
| 415 | 390 |
<div class="sort_btn"> |
| 416 | 391 |
<img src="/direct/img/sort_up_img.png" alt=""> |
| 417 | 392 |
</div> |
| 418 | 393 |
</div> |
| 419 | 394 |
</th> |
| 420 |
- <th>중분류 |
|
| 421 |
- <div class="sort" id="sort_companySecondCategory"> |
|
| 395 |
+ <th> |
|
| 396 |
+ <div class="sort" id="sort_companyManagerName">담당자 |
|
| 422 | 397 |
<div class="sort_btn"> |
| 423 | 398 |
<img src="/direct/img/sort_up_img.png" alt=""> |
| 424 | 399 |
</div> |
| 425 | 400 |
</div> |
| 426 | 401 |
</th> |
| 427 |
- <th>업체명 |
|
| 428 |
- <div class="sort" id="sort_companyPartnerMutual"> |
|
| 402 |
+ <th> |
|
| 403 |
+ <div class="sort" id="sort_companyManagerSpot">직위 |
|
| 429 | 404 |
<div class="sort_btn"> |
| 430 | 405 |
<img src="/direct/img/sort_up_img.png" alt=""> |
| 431 | 406 |
</div> |
| 432 | 407 |
</div> |
| 433 | 408 |
</th> |
| 434 |
- <th>담당자 |
|
| 435 |
- <div class="sort" id="sort_companyManagerName"> |
|
| 409 |
+ <th> |
|
| 410 |
+ <div class="sort" id="sort_companyManagerTel">연락처 |
|
| 436 | 411 |
<div class="sort_btn"> |
| 437 | 412 |
<img src="/direct/img/sort_up_img.png" alt=""> |
| 438 | 413 |
</div> |
| 439 | 414 |
</div> |
| 440 | 415 |
</th> |
| 441 |
- <th>직위 |
|
| 442 |
- <div class="sort" id="sort_companyManagerSpot"> |
|
| 416 |
+ <th> |
|
| 417 |
+ <div class="sort" id="sort_companyManagerEmail">이메일 |
|
| 443 | 418 |
<div class="sort_btn"> |
| 444 | 419 |
<img src="/direct/img/sort_up_img.png" alt=""> |
| 445 | 420 |
</div> |
| 446 | 421 |
</div> |
| 447 | 422 |
</th> |
| 448 |
- <th>연락처 |
|
| 449 |
- <div class="sort" id="sort_companyManagerTel"> |
|
| 450 |
- <div class="sort_btn"> |
|
| 451 |
- <img src="/direct/img/sort_up_img.png" alt=""> |
|
| 452 |
- </div> |
|
| 453 |
- </div> |
|
| 454 |
- </th> |
|
| 455 |
- <th>이메일 |
|
| 456 |
- <div class="sort" id="sort_companyManagerEmail"> |
|
| 457 |
- <div class="sort_btn"> |
|
| 458 |
- <img src="/direct/img/sort_up_img.png" alt=""> |
|
| 459 |
- </div> |
|
| 460 |
- </div> |
|
| 461 |
- </th> |
|
| 462 |
- <th>사업자등록번호 |
|
| 463 |
- <div class="sort" id="sort_companyPartnerCrnum"> |
|
| 423 |
+ <th> |
|
| 424 |
+ <div class="sort" id="sort_companyPartnerCrnum">사업자등록번호 |
|
| 464 | 425 |
<div class="sort_btn"> |
| 465 | 426 |
<img src="/direct/img/sort_up_img.png" alt=""> |
| 466 | 427 |
</div> |
... | ... | @@ -476,19 +437,20 @@ |
| 476 | 437 |
<label for="check${status.index}"></label>
|
| 477 | 438 |
</td> |
| 478 | 439 |
<td> |
| 479 |
- <c:if test="${companyMngVO.searchSortOrd eq 'desc' }">
|
|
| 480 |
- <c:out value="${( paginationInfo.totalRecordCount - ((companyMngVO.pageIndex -1)*companyMngVO.pageUnit) ) - status.index }"/>
|
|
| 481 |
- </c:if> |
|
| 482 |
- <c:if test="${companyMngVO.searchSortOrd eq 'asc' }">
|
|
| 483 |
- <c:out value="${(companyMngVO.pageIndex - 1) * companyMngVO.pageUnit + status.count}"/>
|
|
| 484 |
- </c:if> |
|
| 440 |
+ <c:if test="${companyMngVO.searchSortOrd eq 'desc' }">
|
|
| 441 |
+ <c:out value="${( paginationInfo.totalRecordCount - ((companyMngVO.pageIndex -1)*companyMngVO.pageUnit) ) - status.index }"/>
|
|
| 442 |
+ </c:if> |
|
| 443 |
+ <c:if test="${companyMngVO.searchSortOrd eq 'asc' }">
|
|
| 444 |
+ <c:out value="${(companyMngVO.pageIndex - 1) * companyMngVO.pageUnit + status.count}"/>
|
|
| 445 |
+ </c:if> |
|
| 485 | 446 |
</td> |
| 486 |
- |
|
| 447 |
+ <td> |
|
| 487 | 448 |
<c:forEach var="codeList" items="${companyItemCdList}" varStatus="status">
|
| 488 | 449 |
<c:if test="${result.companyMainCategory eq codeList.id}">
|
| 489 |
- <td>${codeList.text}</td>
|
|
| 450 |
+ ${codeList.text}
|
|
| 490 | 451 |
</c:if> |
| 491 | 452 |
</c:forEach> |
| 453 |
+ </td> |
|
| 492 | 454 |
<td> |
| 493 | 455 |
${result.companySecondCategory}
|
| 494 | 456 |
</td> |
--- 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 @@ |
| 728 | 728 |
<c:forEach var="companyManagerInfo" items="${companyManagerList}" varStatus="status">
|
| 729 | 729 |
<tr id="${companyManagerInfo.companyManagerId}">
|
| 730 | 730 |
<td style="text-align:left;"> |
| 731 |
- <ul> |
|
| 731 |
+ <ul style="overflow: revert;"> |
|
| 732 | 732 |
<li> |
| 733 | 733 |
<input type="radio" name="companyManagerSelect" id="manager_${status.index}" value="${companyManagerInfo.companyManagerId}"
|
| 734 | 734 |
<c:if test="${companyManagerInfo.companyManagerSelect eq 1 }">
|
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?