diff --git a/src/main/java/itn/let/fax/addr/web/FaxAddrController.java b/src/main/java/itn/let/fax/addr/web/FaxAddrController.java index 65123a00..ba806f72 100644 --- a/src/main/java/itn/let/fax/addr/web/FaxAddrController.java +++ b/src/main/java/itn/let/fax/addr/web/FaxAddrController.java @@ -1665,7 +1665,7 @@ public class FaxAddrController { List addrGroupList = faxAddrGroupService.selectFaxAddrGroupList(faxaddrGroupVO); //회원별 주소록 전체 갯수 조회 - int addrTotalCount = faxAddrService.selectFaxAddrTotalCount(faxaddrVO); +// int addrTotalCount = faxAddrService.selectFaxAddrTotalCount(faxaddrVO); faxaddrVO.setType("bookmark"); List addrBookmarkList = faxAddrService.selectFaxAddrBasicGrpList(faxaddrVO); @@ -1673,6 +1673,30 @@ public class FaxAddrController { faxaddrVO.setType("noGrp"); List addrNoGrpList = faxAddrService.selectFaxAddrBasicGrpList(faxaddrVO); + + + int totalGrpCount = addrGroupList.stream() + .mapToInt(group -> { + String grpCountStr = group.getGrpCount(); + if (grpCountStr != null && !grpCountStr.isEmpty()) { + try { + return Integer.parseInt(grpCountStr); + } catch (NumberFormatException e) { + // 파싱에 실패한 경우 0을 반환하거나 예외 처리를 합니다. + return 0; + } + } else { + return 0; + } + }) + .sum(); + + int addrTotalCount = (addrNoGrpList.size() >0 ? addrNoGrpList.get(0).getTotcnt() : 0) + + (addrBookmarkList.size() >0 ? addrBookmarkList.get(0).getTotcnt() : 0) + + totalGrpCount + ; + + model.addAttribute("addrTotalCount", addrTotalCount); model.addAttribute("addrGroupList", addrGroupList); model.addAttribute("addrBookmarkList", addrBookmarkList); diff --git a/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrGroupListAjaxView.jsp b/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrGroupListAjaxView.jsp index c7272228..145712fd 100644 --- a/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrGroupListAjaxView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrGroupListAjaxView.jsp @@ -13,12 +13,13 @@ $(".adr_cb_wrap2").click(function(){
-
+
<%-- --%> -

- 폴더 닫힘전체[명] -

+ + + 전체

+
diff --git a/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp index 6a1ee9d4..32456255 100644 --- a/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp @@ -562,7 +562,7 @@
-