diff --git a/src/main/java/itn/let/mjo/addr/web/AddrController.java b/src/main/java/itn/let/mjo/addr/web/AddrController.java index 2016cd46..2f04ae77 100644 --- a/src/main/java/itn/let/mjo/addr/web/AddrController.java +++ b/src/main/java/itn/let/mjo/addr/web/AddrController.java @@ -15,6 +15,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; @@ -50,6 +51,7 @@ import itn.com.cmm.LoginVO; import itn.com.cmm.util.RedirectUrlMaker; import itn.com.cmm.util.StringUtil; import itn.com.utl.fcc.service.EgovStringUtil; +import itn.let.fax.addr.service.FaxAddrVO; import itn.let.mjo.addr.service.AddrGroupService; import itn.let.mjo.addr.service.AddrGroupVO; import itn.let.mjo.addr.service.AddrService; @@ -386,8 +388,11 @@ public class AddrController { addrVO.setSearchSortCnd("addrId"); addrVO.setSearchSortOrd("asc"); } - - List addrList = addrService.selectAddrList(addrVO); + + List addrList = new ArrayList(); + if(StringUtils.isNotEmpty(addrVO.getSearchAddrGrpId())) { + addrList = addrService.selectAddrList(addrVO); + } int totCnt = 0; if(addrList.size() > 0) { diff --git a/src/main/webapp/WEB-INF/jsp/web/addr/AddrGroupListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/addr/AddrGroupListAjax.jsp index 7e3d19ef..da250be8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/addr/AddrGroupListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/addr/AddrGroupListAjax.jsp @@ -684,7 +684,8 @@ function listAddrTransHistAjax(pageNo) { -

폴더 열림전체[${addrTotalCount }/최대 1,000,000]

+<%--

폴더 열림전체[${addrTotalCount }/최대 1,000,000]

--%> +

폴더 열림전체[${addrTotalCount }/최대 1,000,000]

diff --git a/src/main/webapp/WEB-INF/jsp/web/addr/AddrListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/addr/AddrListAjax.jsp index f3d4e906..d27a2b25 100644 --- a/src/main/webapp/WEB-INF/jsp/web/addr/AddrListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/addr/AddrListAjax.jsp @@ -723,82 +723,91 @@ function setAddrDupliClose() { - - - - - - - - - - - - - - - - - "> - " /> - " /> - -

- -

-

- -

- - "> -

- " /> - -

- - - "> -

- " /> - -

- - "> -

- " /> - -

- - "> -

- " /> - -

- - "> -

- " /> - -

- - "> -

- " /> - -

- - - - - - - - -
+ + + + + + + + + + + + + + + + + + + "> + " /> + " /> + +

+ +

+

+ +

+ + "> +

+ " /> + +

+ + + "> +

+ " /> + +

+ + "> +

+ " /> + +

+ + "> +

+ " /> + +

+ + "> +

+ " /> + +

+ + "> +

+ " /> + +

+ + + + + + + + +
+
+ + + 주소록 그룹을 선택해 주세요. + + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrGroupListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrGroupListAjax.jsp index 2548fe65..09a4c63c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrGroupListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrGroupListAjax.jsp @@ -599,7 +599,8 @@ function listAddrTransHistAjax(pageNo) {
-

폴더 열림전체[/최대 1,000,000]

+<%--

폴더 열림전체[/최대 1,000,000]

--%> +

폴더 열림전체[/최대 1,000,000]