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

---
 .../itn/let/mjo/addr/web/AddrController.java  |   9 +-
 .../jsp/web/addr/AddrGroupListAjax.jsp        |   3 +-
 .../WEB-INF/jsp/web/addr/AddrListAjax.jsp     | 161 +++++++++---------
 .../jsp/web/fax/addr/FaxAddrGroupListAjax.jsp |   3 +-
 4 files changed, 96 insertions(+), 80 deletions(-)

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<AddrVO> addrList = addrService.selectAddrList(addrVO);
+
+		List<AddrVO> 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) {
 				<label for="groupAll" class="label">전체 선택</label>
 				<input type="checkbox" name="groupAll" id="groupAll" value="1" onClick="fnCheckAll();">
 			</div>
-			<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>
+<%-- 			<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> --%>
+			<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>
 		</div>
 		<div class="adr1_btnWrap">
 			<div>
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() {
 				</tr>
 			</thead>
 			<tbody>
-				<c:forEach var="result" items="${addrList}" varStatus="status">
-					<c:choose>
-						<c:when test="${empty result.addrGrpNm}">
-							<c:set var="grpNm" value="그룹미지정" />
-							<c:if test="${result.bookmark eq 'Y' }">
-	                			<c:set var="grpNm" value="자주보내는 번호" />
-                			</c:if>							
-						</c:when>
-						<c:otherwise><c:set var="grpNm" value="${result.addrGrpNm}" /></c:otherwise>
-					</c:choose>					
-					<tr>
-						<td>
-							<label for="" class="label">선택</label>
-							<input type="hidden" name="addrIds" value="${result.addrId}" />
-							<input name="addrCheck" id="del_${status.index}" class="${result.addrPhoneNo}" type="checkbox" value="${result.addrId}" />
-						</td>
-						<td title="<c:out value="${grpNm}" />">
-							<input type="hidden" class="addrGrpIdsHidden" name="addrGrpIdsHidden" value="<c:out value="${result.addrGrpId}" />" />
-							<input type="hidden" class="bookmarkHidden" name="bookmarkHidden" value="<c:out value="${result.bookmark}" />" />
-							
-							<p class="addrGrpIdArea">
-								<c:out value="${grpNm}" />
-							</p>
-							<p class="addrGrpIdArea2">
-
-							</p>							
-						</td>
-						<td title="<c:out value="${result.addrPhoneNo}" />">
-							<p>
-								<input type="hidden" class="addrPhones" name="addrPhones" value="<c:out value="${result.addrPhoneNo}" />" />
-								<span class="spanAddrPhones"><c:out value="${result.addrPhoneNo}" /></span>														
-							</p>
-
-						</td>
-						<td title="<c:out value="${result.addrNm}" />">
-							<p>
-								<input type="hidden" class="addrNms" name="addrNms" value="<c:out value="${result.addrNm}" />" />
-								<span class="spanAddrNms"><c:out value="${result.addrNm}" /></span>
-							</p>
-						</td>
-						<td title="<c:out value="${result.addrInfo1}" />">
-							<p>
-								<input type="hidden" class="addrInfo1s" name="addrInfo1s[${status.index}]" value="<c:out value="${result.addrInfo1}" />" />
-								<span class="spanAddrInfo1s"><c:out value="${result.addrInfo1}" /></span>
-							</p>
-						</td>
-						<td title="<c:out value="${result.addrInfo2}" />">
-							<p>
-								<input type="hidden" class="addrInfo2s" name="addrInfo2s[${status.index}]" value="<c:out value="${result.addrInfo2}" />" />
-								<span class="spanAddrInfo2s"><c:out value="${result.addrInfo2}" /></span>
-							</p>
-						</td>
-						<td title="<c:out value="${result.addrInfo3}" />">
-							<p>
-								<input type="hidden" class="addrInfo3s" name="addrInfo3s[${status.index}]" value="<c:out value="${result.addrInfo3}" />" />
-								<span class="spanAddrInfo3s"><c:out value="${result.addrInfo3}" /></span>
-							</p>
-						</td>
-						<td title="<c:out value="${result.addrInfo4}" />">
-							<p>
-								<input type="hidden" class="addrInfo4s" name="addrInfo4s[${status.index}]" value="<c:out value="${result.addrInfo4}" />" />
-								<span class="spanAddrInfo4s"><c:out value="${result.addrInfo4}" /></span>
-							</p>
-						</td>
-						<td>
-							<button type="button" onclick="memoOpen('<c:out value="${result.addrId}" />'); return false;" data-tooltip="adr_popup13">
-								<img src="/publish/images/content/memo_img.png" alt="메모">
-							</button>
-						</td>
-						<td>
-							<button type="button" onclick="javascript:deleteAddr('<c:out value="${result.addrId}"/>');return false;">
-								<img src="/publish/images/content/del_img.png" alt="삭제">
-							</button>
-						</td>
-					</tr>
-				</c:forEach>
+				<c:choose>
+					<c:when test="${not empty addrList}">
+						<c:forEach var="result" items="${addrList}" varStatus="status">
+							<c:choose>
+								<c:when test="${empty result.addrGrpNm}">
+									<c:set var="grpNm" value="그룹미지정" />
+									<c:if test="${result.bookmark eq 'Y' }">
+			                			<c:set var="grpNm" value="자주보내는 번호" />
+		                			</c:if>							
+								</c:when>
+								<c:otherwise><c:set var="grpNm" value="${result.addrGrpNm}" /></c:otherwise>
+							</c:choose>					
+							<tr>
+								<td>
+									<label for="" class="label">선택</label>
+									<input type="hidden" name="addrIds" value="${result.addrId}" />
+									<input name="addrCheck" id="del_${status.index}" class="${result.addrPhoneNo}" type="checkbox" value="${result.addrId}" />
+								</td>
+								<td title="<c:out value="${grpNm}" />">
+									<input type="hidden" class="addrGrpIdsHidden" name="addrGrpIdsHidden" value="<c:out value="${result.addrGrpId}" />" />
+									<input type="hidden" class="bookmarkHidden" name="bookmarkHidden" value="<c:out value="${result.bookmark}" />" />
+									
+									<p class="addrGrpIdArea">
+										<c:out value="${grpNm}" />
+									</p>
+									<p class="addrGrpIdArea2">
+		
+									</p>							
+								</td>
+								<td title="<c:out value="${result.addrPhoneNo}" />">
+									<p>
+										<input type="hidden" class="addrPhones" name="addrPhones" value="<c:out value="${result.addrPhoneNo}" />" />
+										<span class="spanAddrPhones"><c:out value="${result.addrPhoneNo}" /></span>														
+									</p>
+		
+								</td>
+								<td title="<c:out value="${result.addrNm}" />">
+									<p>
+										<input type="hidden" class="addrNms" name="addrNms" value="<c:out value="${result.addrNm}" />" />
+										<span class="spanAddrNms"><c:out value="${result.addrNm}" /></span>
+									</p>
+								</td>
+								<td title="<c:out value="${result.addrInfo1}" />">
+									<p>
+										<input type="hidden" class="addrInfo1s" name="addrInfo1s[${status.index}]" value="<c:out value="${result.addrInfo1}" />" />
+										<span class="spanAddrInfo1s"><c:out value="${result.addrInfo1}" /></span>
+									</p>
+								</td>
+								<td title="<c:out value="${result.addrInfo2}" />">
+									<p>
+										<input type="hidden" class="addrInfo2s" name="addrInfo2s[${status.index}]" value="<c:out value="${result.addrInfo2}" />" />
+										<span class="spanAddrInfo2s"><c:out value="${result.addrInfo2}" /></span>
+									</p>
+								</td>
+								<td title="<c:out value="${result.addrInfo3}" />">
+									<p>
+										<input type="hidden" class="addrInfo3s" name="addrInfo3s[${status.index}]" value="<c:out value="${result.addrInfo3}" />" />
+										<span class="spanAddrInfo3s"><c:out value="${result.addrInfo3}" /></span>
+									</p>
+								</td>
+								<td title="<c:out value="${result.addrInfo4}" />">
+									<p>
+										<input type="hidden" class="addrInfo4s" name="addrInfo4s[${status.index}]" value="<c:out value="${result.addrInfo4}" />" />
+										<span class="spanAddrInfo4s"><c:out value="${result.addrInfo4}" /></span>
+									</p>
+								</td>
+								<td>
+									<button type="button" onclick="memoOpen('<c:out value="${result.addrId}" />'); return false;" data-tooltip="adr_popup13">
+										<img src="/publish/images/content/memo_img.png" alt="메모">
+									</button>
+								</td>
+								<td>
+									<button type="button" onclick="javascript:deleteAddr('<c:out value="${result.addrId}"/>');return false;">
+										<img src="/publish/images/content/del_img.png" alt="삭제">
+									</button>
+								</td>
+							</tr>
+						</c:forEach>
+					</c:when>
+					<c:otherwise>
+						<tr class="td_none">
+							<td colspan="10">주소록 그룹을 선택해 주세요.</td>
+						</tr>
+					</c:otherwise>
+				</c:choose>
 			</tbody>
 		</table>
 		</form>
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) {
 				<label for="groupAll" class="label">전체 선택</label>
 				<input type="checkbox" name="groupAll" id="groupAll" value="1" onClick="fnCheckAll();">
 			</div>
-			<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>
+<%-- 			<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> --%>
+			<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>
 		</div>
 		<div class="adr1_btnWrap">
 			<div>