--- src/main/java/itn/let/mjo/addr/web/AddrController.java
+++ src/main/java/itn/let/mjo/addr/web/AddrController.java
... | ... | @@ -15,6 +15,7 @@ |
| 15 | 15 |
import javax.servlet.http.HttpServletRequest; |
| 16 | 16 |
import javax.servlet.http.HttpServletResponse; |
| 17 | 17 |
|
| 18 |
+import org.apache.commons.lang3.StringUtils; |
|
| 18 | 19 |
import org.apache.poi.hssf.usermodel.HSSFCell; |
| 19 | 20 |
import org.apache.poi.hssf.usermodel.HSSFRow; |
| 20 | 21 |
import org.apache.poi.hssf.usermodel.HSSFSheet; |
... | ... | @@ -50,6 +51,7 @@ |
| 50 | 51 |
import itn.com.cmm.util.RedirectUrlMaker; |
| 51 | 52 |
import itn.com.cmm.util.StringUtil; |
| 52 | 53 |
import itn.com.utl.fcc.service.EgovStringUtil; |
| 54 |
+import itn.let.fax.addr.service.FaxAddrVO; |
|
| 53 | 55 |
import itn.let.mjo.addr.service.AddrGroupService; |
| 54 | 56 |
import itn.let.mjo.addr.service.AddrGroupVO; |
| 55 | 57 |
import itn.let.mjo.addr.service.AddrService; |
... | ... | @@ -386,8 +388,11 @@ |
| 386 | 388 |
addrVO.setSearchSortCnd("addrId");
|
| 387 | 389 |
addrVO.setSearchSortOrd("asc");
|
| 388 | 390 |
} |
| 389 |
- |
|
| 390 |
- List<AddrVO> addrList = addrService.selectAddrList(addrVO); |
|
| 391 |
+ |
|
| 392 |
+ List<AddrVO> addrList = new ArrayList(); |
|
| 393 |
+ if(StringUtils.isNotEmpty(addrVO.getSearchAddrGrpId())) {
|
|
| 394 |
+ addrList = addrService.selectAddrList(addrVO); |
|
| 395 |
+ } |
|
| 391 | 396 |
|
| 392 | 397 |
int totCnt = 0; |
| 393 | 398 |
if(addrList.size() > 0) {
|
--- src/main/webapp/WEB-INF/jsp/web/addr/AddrGroupListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/addr/AddrGroupListAjax.jsp
... | ... | @@ -684,7 +684,8 @@ |
| 684 | 684 |
<label for="groupAll" class="label">전체 선택</label> |
| 685 | 685 |
<input type="checkbox" name="groupAll" id="groupAll" value="1" onClick="fnCheckAll();"> |
| 686 | 686 |
</div> |
| 687 |
- <p class="open" onclick="openThisGroup('');"><img src="/publish/images/content/open_folder.png" alt="폴더 열림">전체[<span class="c_002c9a fwMd" id="addrTotCnt">${addrTotalCount }</span>/최대 1,000,000]</p>
|
|
| 687 |
+<%-- <p class="open" onclick="openThisGroup('');"><img src="/publish/images/content/open_folder.png" alt="폴더 열림">전체[<span class="c_002c9a fwMd" id="addrTotCnt">${addrTotalCount }</span>/최대 1,000,000]</p> --%>
|
|
| 688 |
+ <p class="open"><img src="/publish/images/content/open_folder.png" alt="폴더 열림">전체[<span class="c_002c9a fwMd" id="addrTotCnt">${addrTotalCount }</span>/최대 1,000,000]</p>
|
|
| 688 | 689 |
</div> |
| 689 | 690 |
<div class="adr1_btnWrap"> |
| 690 | 691 |
<div> |
--- src/main/webapp/WEB-INF/jsp/web/addr/AddrListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/addr/AddrListAjax.jsp
... | ... | @@ -723,82 +723,91 @@ |
| 723 | 723 |
</tr> |
| 724 | 724 |
</thead> |
| 725 | 725 |
<tbody> |
| 726 |
- <c:forEach var="result" items="${addrList}" varStatus="status">
|
|
| 727 |
- <c:choose> |
|
| 728 |
- <c:when test="${empty result.addrGrpNm}">
|
|
| 729 |
- <c:set var="grpNm" value="그룹미지정" /> |
|
| 730 |
- <c:if test="${result.bookmark eq 'Y' }">
|
|
| 731 |
- <c:set var="grpNm" value="자주보내는 번호" /> |
|
| 732 |
- </c:if> |
|
| 733 |
- </c:when> |
|
| 734 |
- <c:otherwise><c:set var="grpNm" value="${result.addrGrpNm}" /></c:otherwise>
|
|
| 735 |
- </c:choose> |
|
| 736 |
- <tr> |
|
| 737 |
- <td> |
|
| 738 |
- <label for="" class="label">선택</label> |
|
| 739 |
- <input type="hidden" name="addrIds" value="${result.addrId}" />
|
|
| 740 |
- <input name="addrCheck" id="del_${status.index}" class="${result.addrPhoneNo}" type="checkbox" value="${result.addrId}" />
|
|
| 741 |
- </td> |
|
| 742 |
- <td title="<c:out value="${grpNm}" />">
|
|
| 743 |
- <input type="hidden" class="addrGrpIdsHidden" name="addrGrpIdsHidden" value="<c:out value="${result.addrGrpId}" />" />
|
|
| 744 |
- <input type="hidden" class="bookmarkHidden" name="bookmarkHidden" value="<c:out value="${result.bookmark}" />" />
|
|
| 745 |
- |
|
| 746 |
- <p class="addrGrpIdArea"> |
|
| 747 |
- <c:out value="${grpNm}" />
|
|
| 748 |
- </p> |
|
| 749 |
- <p class="addrGrpIdArea2"> |
|
| 750 |
- |
|
| 751 |
- </p> |
|
| 752 |
- </td> |
|
| 753 |
- <td title="<c:out value="${result.addrPhoneNo}" />">
|
|
| 754 |
- <p> |
|
| 755 |
- <input type="hidden" class="addrPhones" name="addrPhones" value="<c:out value="${result.addrPhoneNo}" />" />
|
|
| 756 |
- <span class="spanAddrPhones"><c:out value="${result.addrPhoneNo}" /></span>
|
|
| 757 |
- </p> |
|
| 758 |
- |
|
| 759 |
- </td> |
|
| 760 |
- <td title="<c:out value="${result.addrNm}" />">
|
|
| 761 |
- <p> |
|
| 762 |
- <input type="hidden" class="addrNms" name="addrNms" value="<c:out value="${result.addrNm}" />" />
|
|
| 763 |
- <span class="spanAddrNms"><c:out value="${result.addrNm}" /></span>
|
|
| 764 |
- </p> |
|
| 765 |
- </td> |
|
| 766 |
- <td title="<c:out value="${result.addrInfo1}" />">
|
|
| 767 |
- <p> |
|
| 768 |
- <input type="hidden" class="addrInfo1s" name="addrInfo1s[${status.index}]" value="<c:out value="${result.addrInfo1}" />" />
|
|
| 769 |
- <span class="spanAddrInfo1s"><c:out value="${result.addrInfo1}" /></span>
|
|
| 770 |
- </p> |
|
| 771 |
- </td> |
|
| 772 |
- <td title="<c:out value="${result.addrInfo2}" />">
|
|
| 773 |
- <p> |
|
| 774 |
- <input type="hidden" class="addrInfo2s" name="addrInfo2s[${status.index}]" value="<c:out value="${result.addrInfo2}" />" />
|
|
| 775 |
- <span class="spanAddrInfo2s"><c:out value="${result.addrInfo2}" /></span>
|
|
| 776 |
- </p> |
|
| 777 |
- </td> |
|
| 778 |
- <td title="<c:out value="${result.addrInfo3}" />">
|
|
| 779 |
- <p> |
|
| 780 |
- <input type="hidden" class="addrInfo3s" name="addrInfo3s[${status.index}]" value="<c:out value="${result.addrInfo3}" />" />
|
|
| 781 |
- <span class="spanAddrInfo3s"><c:out value="${result.addrInfo3}" /></span>
|
|
| 782 |
- </p> |
|
| 783 |
- </td> |
|
| 784 |
- <td title="<c:out value="${result.addrInfo4}" />">
|
|
| 785 |
- <p> |
|
| 786 |
- <input type="hidden" class="addrInfo4s" name="addrInfo4s[${status.index}]" value="<c:out value="${result.addrInfo4}" />" />
|
|
| 787 |
- <span class="spanAddrInfo4s"><c:out value="${result.addrInfo4}" /></span>
|
|
| 788 |
- </p> |
|
| 789 |
- </td> |
|
| 790 |
- <td> |
|
| 791 |
- <button type="button" onclick="memoOpen('<c:out value="${result.addrId}" />'); return false;" data-tooltip="adr_popup13">
|
|
| 792 |
- <img src="/publish/images/content/memo_img.png" alt="메모"> |
|
| 793 |
- </button> |
|
| 794 |
- </td> |
|
| 795 |
- <td> |
|
| 796 |
- <button type="button" onclick="javascript:deleteAddr('<c:out value="${result.addrId}"/>');return false;">
|
|
| 797 |
- <img src="/publish/images/content/del_img.png" alt="삭제"> |
|
| 798 |
- </button> |
|
| 799 |
- </td> |
|
| 800 |
- </tr> |
|
| 801 |
- </c:forEach> |
|
| 726 |
+ <c:choose> |
|
| 727 |
+ <c:when test="${not empty addrList}">
|
|
| 728 |
+ <c:forEach var="result" items="${addrList}" varStatus="status">
|
|
| 729 |
+ <c:choose> |
|
| 730 |
+ <c:when test="${empty result.addrGrpNm}">
|
|
| 731 |
+ <c:set var="grpNm" value="그룹미지정" /> |
|
| 732 |
+ <c:if test="${result.bookmark eq 'Y' }">
|
|
| 733 |
+ <c:set var="grpNm" value="자주보내는 번호" /> |
|
| 734 |
+ </c:if> |
|
| 735 |
+ </c:when> |
|
| 736 |
+ <c:otherwise><c:set var="grpNm" value="${result.addrGrpNm}" /></c:otherwise>
|
|
| 737 |
+ </c:choose> |
|
| 738 |
+ <tr> |
|
| 739 |
+ <td> |
|
| 740 |
+ <label for="" class="label">선택</label> |
|
| 741 |
+ <input type="hidden" name="addrIds" value="${result.addrId}" />
|
|
| 742 |
+ <input name="addrCheck" id="del_${status.index}" class="${result.addrPhoneNo}" type="checkbox" value="${result.addrId}" />
|
|
| 743 |
+ </td> |
|
| 744 |
+ <td title="<c:out value="${grpNm}" />">
|
|
| 745 |
+ <input type="hidden" class="addrGrpIdsHidden" name="addrGrpIdsHidden" value="<c:out value="${result.addrGrpId}" />" />
|
|
| 746 |
+ <input type="hidden" class="bookmarkHidden" name="bookmarkHidden" value="<c:out value="${result.bookmark}" />" />
|
|
| 747 |
+ |
|
| 748 |
+ <p class="addrGrpIdArea"> |
|
| 749 |
+ <c:out value="${grpNm}" />
|
|
| 750 |
+ </p> |
|
| 751 |
+ <p class="addrGrpIdArea2"> |
|
| 752 |
+ |
|
| 753 |
+ </p> |
|
| 754 |
+ </td> |
|
| 755 |
+ <td title="<c:out value="${result.addrPhoneNo}" />">
|
|
| 756 |
+ <p> |
|
| 757 |
+ <input type="hidden" class="addrPhones" name="addrPhones" value="<c:out value="${result.addrPhoneNo}" />" />
|
|
| 758 |
+ <span class="spanAddrPhones"><c:out value="${result.addrPhoneNo}" /></span>
|
|
| 759 |
+ </p> |
|
| 760 |
+ |
|
| 761 |
+ </td> |
|
| 762 |
+ <td title="<c:out value="${result.addrNm}" />">
|
|
| 763 |
+ <p> |
|
| 764 |
+ <input type="hidden" class="addrNms" name="addrNms" value="<c:out value="${result.addrNm}" />" />
|
|
| 765 |
+ <span class="spanAddrNms"><c:out value="${result.addrNm}" /></span>
|
|
| 766 |
+ </p> |
|
| 767 |
+ </td> |
|
| 768 |
+ <td title="<c:out value="${result.addrInfo1}" />">
|
|
| 769 |
+ <p> |
|
| 770 |
+ <input type="hidden" class="addrInfo1s" name="addrInfo1s[${status.index}]" value="<c:out value="${result.addrInfo1}" />" />
|
|
| 771 |
+ <span class="spanAddrInfo1s"><c:out value="${result.addrInfo1}" /></span>
|
|
| 772 |
+ </p> |
|
| 773 |
+ </td> |
|
| 774 |
+ <td title="<c:out value="${result.addrInfo2}" />">
|
|
| 775 |
+ <p> |
|
| 776 |
+ <input type="hidden" class="addrInfo2s" name="addrInfo2s[${status.index}]" value="<c:out value="${result.addrInfo2}" />" />
|
|
| 777 |
+ <span class="spanAddrInfo2s"><c:out value="${result.addrInfo2}" /></span>
|
|
| 778 |
+ </p> |
|
| 779 |
+ </td> |
|
| 780 |
+ <td title="<c:out value="${result.addrInfo3}" />">
|
|
| 781 |
+ <p> |
|
| 782 |
+ <input type="hidden" class="addrInfo3s" name="addrInfo3s[${status.index}]" value="<c:out value="${result.addrInfo3}" />" />
|
|
| 783 |
+ <span class="spanAddrInfo3s"><c:out value="${result.addrInfo3}" /></span>
|
|
| 784 |
+ </p> |
|
| 785 |
+ </td> |
|
| 786 |
+ <td title="<c:out value="${result.addrInfo4}" />">
|
|
| 787 |
+ <p> |
|
| 788 |
+ <input type="hidden" class="addrInfo4s" name="addrInfo4s[${status.index}]" value="<c:out value="${result.addrInfo4}" />" />
|
|
| 789 |
+ <span class="spanAddrInfo4s"><c:out value="${result.addrInfo4}" /></span>
|
|
| 790 |
+ </p> |
|
| 791 |
+ </td> |
|
| 792 |
+ <td> |
|
| 793 |
+ <button type="button" onclick="memoOpen('<c:out value="${result.addrId}" />'); return false;" data-tooltip="adr_popup13">
|
|
| 794 |
+ <img src="/publish/images/content/memo_img.png" alt="메모"> |
|
| 795 |
+ </button> |
|
| 796 |
+ </td> |
|
| 797 |
+ <td> |
|
| 798 |
+ <button type="button" onclick="javascript:deleteAddr('<c:out value="${result.addrId}"/>');return false;">
|
|
| 799 |
+ <img src="/publish/images/content/del_img.png" alt="삭제"> |
|
| 800 |
+ </button> |
|
| 801 |
+ </td> |
|
| 802 |
+ </tr> |
|
| 803 |
+ </c:forEach> |
|
| 804 |
+ </c:when> |
|
| 805 |
+ <c:otherwise> |
|
| 806 |
+ <tr class="td_none"> |
|
| 807 |
+ <td colspan="10">주소록 그룹을 선택해 주세요.</td> |
|
| 808 |
+ </tr> |
|
| 809 |
+ </c:otherwise> |
|
| 810 |
+ </c:choose> |
|
| 802 | 811 |
</tbody> |
| 803 | 812 |
</table> |
| 804 | 813 |
</form> |
--- src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrGroupListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrGroupListAjax.jsp
... | ... | @@ -599,7 +599,8 @@ |
| 599 | 599 |
<label for="groupAll" class="label">전체 선택</label> |
| 600 | 600 |
<input type="checkbox" name="groupAll" id="groupAll" value="1" onClick="fnCheckAll();"> |
| 601 | 601 |
</div> |
| 602 |
- <p class="open" onclick="openThisGroup('');"><img src="/publish/images/content/open_folder.png" alt="폴더 열림">전체[<span class="c_002c9a fwMd"><fmt:formatNumber value="${addrTotalCount}" pattern="#,###"/></span>/최대 1,000,000]</p>
|
|
| 602 |
+<%-- <p class="open" onclick="openThisGroup('');"><img src="/publish/images/content/open_folder.png" alt="폴더 열림">전체[<span class="c_002c9a fwMd"><fmt:formatNumber value="${addrTotalCount}" pattern="#,###"/></span>/최대 1,000,000]</p> --%>
|
|
| 603 |
+ <p class="open"><img src="/publish/images/content/open_folder.png" alt="폴더 열림">전체[<span class="c_002c9a fwMd"><fmt:formatNumber value="${addrTotalCount}" pattern="#,###"/></span>/최대 1,000,000]</p>
|
|
| 603 | 604 |
</div> |
| 604 | 605 |
<div class="adr1_btnWrap"> |
| 605 | 606 |
<div> |
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?