tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://dudgusw@vcs.iten.co.kr:9999/hylee/mjon_git

Browse Source
This commit is contained in:
wyh 2023-06-15 11:17:30 +09:00
commit 9d7958aec7
2 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/itn/let/fax/user/web/FaxController.java
View File

@ -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"})

24
src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp
View File

@ -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;
}
});
});
@ -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>