Merge branch 'advc' of http://hylee@vcs.iten.co.kr:9999/hylee/mjon_git into advc
into advc
@a3aaba6343d80bdf7e072ce03e6918ed1c042c49
--- src/main/java/itn/let/fax/addr/web/FaxAddrController.java
+++ src/main/java/itn/let/fax/addr/web/FaxAddrController.java
... | ... | @@ -209,13 +209,11 @@ |
| 209 | 209 |
addrVO.setSearchSortCnd("addrId");
|
| 210 | 210 |
addrVO.setSearchSortOrd("asc");
|
| 211 | 211 |
} |
| 212 |
- System.out.println("=================================================="+addrVO.getSearchAddrGrpId());
|
|
| 213 | 212 |
List<FaxAddrVO> addrList = new ArrayList(); |
| 214 | 213 |
if(StringUtils.isNotEmpty(addrVO.getSearchAddrGrpId())) {
|
| 215 | 214 |
addrList = faxAddrService.selectFaxAddrList(addrVO); |
| 216 | 215 |
|
| 217 | 216 |
} |
| 218 |
- System.out.println("==================================================");
|
|
| 219 | 217 |
|
| 220 | 218 |
int totCnt = 0; |
| 221 | 219 |
if(addrList.size() > 0) {
|
--- src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrListAjax.jsp
... | ... | @@ -705,8 +705,8 @@ |
| 705 | 705 |
</c:forEach> |
| 706 | 706 |
</c:when> |
| 707 | 707 |
<c:otherwise> |
| 708 |
- <tr> |
|
| 709 |
- <td colspan="6">검색 결과가 없거나, 좌측 그룹을 선택해 주세요.</td> |
|
| 708 |
+ <tr class="td_none"> |
|
| 709 |
+ <td colspan="6">주소록 그룹을 선택해 주세요.</td> |
|
| 710 | 710 |
</tr> |
| 711 | 711 |
</c:otherwise> |
| 712 | 712 |
</c:choose> |
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?