From b701aae94f6a29bf5914cc9f7f7e289f61e1af01 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Thu, 15 Jun 2023 11:03:03 +0900
Subject: [PATCH] =?UTF-8?q?=ED=8C=A9=EC=8A=A4=EC=A0=84=EC=86=A1=ED=99=94?=
 =?UTF-8?q?=EB=A9=B4=20=EB=B9=84=EB=A1=9C=EA=B7=B8=EC=9D=B8=EC=8B=9C=20?=
 =?UTF-8?q?=EC=98=A4=ED=94=88=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itn/let/fax/user/web/FaxController.java   | 19 +++++++++-----
 .../WEB-INF/jsp/web/fax/faxDataView.jsp       | 26 +++++++++++++++++--
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/main/java/itn/let/fax/user/web/FaxController.java b/src/main/java/itn/let/fax/user/web/FaxController.java
index c1a59657..56fec1ce 100644
--- a/src/main/java/itn/let/fax/user/web/FaxController.java
+++ b/src/main/java/itn/let/fax/user/web/FaxController.java
@@ -1,6 +1,7 @@
 package itn.let.fax.user.web;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -68,7 +69,7 @@ public class FaxController {
 		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
     	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
     	if(StringUtils.isEmpty(userId)) { 
-			return "redirect:/web/user/login/login.do";
+			//return "redirect:/web/user/login/login.do";
     	}
     	// TODO 미로그인 시 로그인 페이지로 이동 처리
 		model.addAttribute("loginVO", loginVO);
@@ -102,9 +103,11 @@ public class FaxController {
 				tempList.add(seqId);
 			}
 			
-			faxAddrVO.setAddrIdList(tempList);
-			faxAddrVO.setMberId(userId);
-			resultFaxAddrList = faxAddrService.selectFaxAddrDataList(faxAddrVO);
+			if (null != userId && !userId.equals("")) {
+				faxAddrVO.setAddrIdList(tempList);
+				faxAddrVO.setMberId(userId);
+				resultFaxAddrList = faxAddrService.selectFaxAddrDataList(faxAddrVO);
+			}
 			
 			for(FaxAddrVO tmp : resultFaxAddrList) {
 				
@@ -141,7 +144,12 @@ public class FaxController {
 		}	
 		
 		/* 목록을 가져 온다 */
-		Map<String, Object> faxDataViewMap = faxService.selectFaxDataView(userId);
+		Map<String, Object> faxDataViewMap = new HashMap<String, Object>();
+		
+		if (null != userId && !userId.equals("")) {
+			faxDataViewMap = faxService.selectFaxDataView(userId);
+		}
+		
     	//최근 전송내역
 		model.addAttribute("resultLatestMsgList", faxDataViewMap.get("resultLatestMsgList"));
 		//자주보내는 번호
@@ -158,7 +166,6 @@ public class FaxController {
 		model.addAttribute("moveAddrFlag", moveAddrFlag);
 		model.addAttribute("moveAddrAllFlag", moveAddrAllFlag);
 		
-
 		return "/web/fax/faxDataView";
 	}
 	@RequestMapping(value= {"/web/mjon/fax/faxSendList.do"})
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 710f4aed..6629d4c7 100644
--- a/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp
@@ -18,6 +18,7 @@
 <!-- 현재 jsp에서 사용하는 file 관련 js  -->
 <script type="text/javascript" src="<c:out value='/js/user/fax/file.js' />"></script>
 <script type="text/javascript">
+	var loginVO = '${loginVO}';
 
 	$(document).ready(function(){
 		
@@ -45,6 +46,11 @@
 		
 		// 발송 버튼 클릭
 		$('#sendBtn').click(function(){
+			if(loginVO == "" || loginVO == null){
+				alert("팩스발송 서비스는 로그인 후 이용 가능합니다.");
+				return false;
+			}
+			
 			if(!valueChk()){
 				return false;
 			}
@@ -91,6 +97,22 @@
 		//////////////////////////////////////// 주소록에서 넘겨받은 주소록청보 처리해주기
 		modeAddrListInsert();
 		
+		//주소록 불러오기 버튼 클릭시
+		$('.popupAddr').click(function(){
+			if(loginVO == "" || loginVO == null){
+				alert("로그인 후 이용이 가능합니다.");
+				return false;
+			}
+		});
+		
+		//엑셀 불러오기 버튼 클릭시
+		$('.popupAddrExcel').click(function(){
+			if(loginVO == "" || loginVO == null){
+				alert("로그인 후 이용이 가능합니다.");
+				return false;
+			}
+		});		
+		
 		
 	});
 	
@@ -239,7 +261,7 @@
 		location.href="<c:url value='/web/mjon/fax/faxSendList.do'/>";
 	}
 	
-	
+
 
 </script>
 
@@ -386,7 +408,7 @@
 															<button type="button" data-tooltip="popup06"  class="btnType btnType7 popupAddr">주소록 불러오기</button>
 														</div>
 														<div class="btn_popup_wrap">
-															<button type="button" data-tooltip="popup02"  class="btnType btnType7">엑셀 불러오기</button>
+															<button type="button" data-tooltip="popup02"  class="btnType btnType7 popupAddrExcel">엑셀 불러오기</button>
 														</div>
 														<div class="btn_popup_wrap">
 															<button type="button" data-tooltip="popup03" class="btnType btnType7 tab1">최근 전송내역</button>