From 09cce7f549facbdfe5aea4c30d604f116d6dcf68 Mon Sep 17 00:00:00 2001
From: "hehihoho3@gmail.com" <hehihoho3@gmail.com>
Date: Tue, 17 Dec 2024 16:45:33 +0900
Subject: [PATCH] =?UTF-8?q?=ED=8C=A9=EC=8A=A4=20=EC=86=8D=EB=8F=84=20?=
 =?UTF-8?q?=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/fax/addr/web/FaxAddrController.java   | 10 ++++++--
 .../fax/addr/web/FaxAddrGroupController.java  | 25 +++++++++++++++++--
 .../let/sym/grd/web/MberGrdMngController.java |  1 +
 .../jsp/web/fax/addr/FaxAddrListAjax.jsp      |  2 +-
 4 files changed, 33 insertions(+), 5 deletions(-)

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 d0e79818..da88b594 100644
--- a/src/main/java/itn/let/fax/addr/web/FaxAddrController.java
+++ b/src/main/java/itn/let/fax/addr/web/FaxAddrController.java
@@ -14,6 +14,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;
@@ -208,8 +209,13 @@ public class FaxAddrController {
 			addrVO.setSearchSortCnd("addrId");
 			addrVO.setSearchSortOrd("asc");
 		}
-		
-		List<FaxAddrVO> addrList = faxAddrService.selectFaxAddrList(addrVO);
+		System.out.println("=================================================="+addrVO.getSearchAddrGrpId());
+		List<FaxAddrVO> addrList = new ArrayList();
+		if(StringUtils.isNotEmpty(addrVO.getSearchAddrGrpId())) {
+			addrList = faxAddrService.selectFaxAddrList(addrVO);
+			
+		}
+		System.out.println("==================================================");
 		
 		int totCnt = 0;
 		 if(addrList.size() > 0) {
diff --git a/src/main/java/itn/let/fax/addr/web/FaxAddrGroupController.java b/src/main/java/itn/let/fax/addr/web/FaxAddrGroupController.java
index 52152d5a..ae341a0d 100644
--- a/src/main/java/itn/let/fax/addr/web/FaxAddrGroupController.java
+++ b/src/main/java/itn/let/fax/addr/web/FaxAddrGroupController.java
@@ -89,15 +89,36 @@ public class FaxAddrGroupController {
 		addrGroupVO.setSiteId("web");
 		List<FaxAddrGroupVO> addrGroupList = faxAddrGroupService.selectFaxAddrGroupList(addrGroupVO);
 		
-		//회원별 주소록 전체 갯수 조회
-		int addrTotalCount = faxAddrService.selectFaxAddrTotalCount(addrVO);
+//		//회원별 주소록 전체 갯수 조회
+//		int addrTotalCount = faxAddrService.selectFaxAddrTotalCount(addrVO);
 		
 		addrVO.setType("bookmark");
 		List<FaxAddrVO> addrBookmarkList = faxAddrService.selectFaxAddrBasicGrpList(addrVO);
 
 		addrVO.setType("noGrp");
 		List<FaxAddrVO> addrNoGrpList = faxAddrService.selectFaxAddrBasicGrpList(addrVO);
+
 		
+		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);
diff --git a/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java b/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java
index 2959404c..26ebf0f7 100644
--- a/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java
+++ b/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java
@@ -362,6 +362,7 @@ public class MberGrdMngController {
 			msg = e.getMessage();
 		}		
 
+        System.out.println("rtnMberGrdVO :: "+ rtnMberGrdVO.getGrdSetNm());
         modelAndView.addObject("rtnMberGrdVO", rtnMberGrdVO);
 		modelAndView.addObject("isSuccess", isSuccess);
 		modelAndView.addObject("msg", msg);
diff --git a/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrListAjax.jsp
index 7ba250dd..0430d356 100644
--- a/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrListAjax.jsp
@@ -706,7 +706,7 @@ function setAddrDupliClose() {
 					</c:when>
 					<c:otherwise>
 						<tr>
-							<td colspan="6">검색 결과가 없습니다.</td>
+							<td colspan="6">검색 결과가 없거나, 좌측 그룹을 선택해 주세요.</td>
 						</tr>
 					</c:otherwise>
 				</c:choose>