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 faxDataViewMap = faxService.selectFaxDataView(userId); + Map faxDataViewMap = new HashMap(); + + 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 @@ @@ -386,7 +408,7 @@
- +