Merge branch 'tolag3'

This commit is contained in:
LJH 2022-12-14 12:05:09 +09:00
commit 8929fcc786
3 changed files with 8 additions and 7 deletions

View File

@ -568,10 +568,6 @@ public class AdjstReqStatusController {
HttpServletRequest request, HttpServletRequest request,
HttpServletResponse response) throws Exception { HttpServletResponse response) throws Exception {
String sessionId = request.getSession().getId();
System.out.println(sessionId);
response.setHeader("Set-Cookie", "JSESSIONID="+ sessionId +"; Path=/; Secure; SameSite=None");
String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString(); String auth = EgovUserDetailsHelper.isAuthenticated() ? null : EgovUserDetailsHelper.getAuthenticatedUser().toString();
LoginVO loginVO = "anonymousUser".equals(auth) ? new LoginVO() : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); LoginVO loginVO = "anonymousUser".equals(auth) ? new LoginVO() : (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();

View File

@ -2286,7 +2286,7 @@ public class EgovLoginController {
// 문자내용 알림톡발송 // 문자내용 알림톡발송
KakaoAtSendVO atVO = new KakaoAtSendVO(); KakaoAtSendVO atVO = new KakaoAtSendVO();
// data set // data set
adjReqMgrVO = otpDataSet(adjReqMgrVO, "at"); // adjReqMgrVO = otpDataSet(adjReqMgrVO, "at");
atVO.setTemplateCode("bizp_2022113014301718895978260"); // 로그인 OTP 템플릿 코드 atVO.setTemplateCode("bizp_2022113014301718895978260"); // 로그인 OTP 템플릿 코드
atVO.setSendTo(adjReqMgrVO.getTrPhone()); //수신자 atVO.setSendTo(adjReqMgrVO.getTrPhone()); //수신자

View File

@ -201,11 +201,12 @@
<table> <table>
<colgroup> <colgroup>
<col style="width: 80px;"> <col style="width: 80px;">
<col style="width: 20%;"> <col style="width: 15%;">
<col style="width: 10%;"> <col style="width: 10%;">
<col style="width: 15%;"> <col style="width: 15%;">
<col style="width: 10%;"> <col style="width: 10%;">
<col style="width: auto%;"> <col style="width: 10%;">
<col style="width: 200px;">
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
@ -215,6 +216,7 @@
<th scope="col">신청인</th> <th scope="col">신청인</th>
<th scope="col">피신청인</th> <th scope="col">피신청인</th>
<th scope="col">신청서류</th> <th scope="col">신청서류</th>
<th scope="col">신청유형</th>
<th scope="col">처리상태</th> <th scope="col">처리상태</th>
</tr> </tr>
</thead> </thead>
@ -249,6 +251,9 @@
<span class="m_th_text">신청서류</span> <span class="m_th_text">신청서류</span>
<p><kc:code codeId="CC303" code="${list.docuTy}"/></p> <p><kc:code codeId="CC303" code="${list.docuTy}"/></p>
</td> </td>
<td class="td_subscriber">
<kc:code codeId="CC305" code="${list.recordReadingFlag}"/>
</td>
<td class="td_subscriber"> <td class="td_subscriber">
<span class="m_th_text">처리상태</span> <span class="m_th_text">처리상태</span>
<p> <p>