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

Merge branch 'master_tolag3'

Browse Source
This commit is contained in:
leejunho 2025-11-11 16:18:22 +09:00
commit b1b012a44e
10 changed files with 53 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java
View File

@ -18,6 +18,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import kcc.com.utl.user.service.CheckLoginUtil;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
@ -163,6 +164,10 @@ public class EgovBBSManageController {
//알림
@Resource(name = "iTNotiUtil")
private ITNotiUtil iTNotiUtil;
// 로그인 체크 util
@Resource(name = "checkLoginUtil")
private CheckLoginUtil checkLoginUtil;
private static final Logger LOGGER = LoggerFactory.getLogger(EgovBBSManageController.class);
@ -1487,14 +1492,24 @@ public class EgovBBSManageController {
BoardMasterVO brdMstrVO ,
RedirectAttributes redirectAttributes ) throws Exception {
SsoLoginVO ssoLoginVO = new SsoLoginVO();
/*SsoLoginVO ssoLoginVO = new SsoLoginVO();
if(null != request.getSession().getAttribute("SSOLoginVO")) {
ssoLoginVO = (SsoLoginVO) request.getSession().getAttribute("SSOLoginVO");
boardVO.setNtcrId(ssoLoginVO.getMembId());
boardVO.setNtcrNm(ssoLoginVO.getMembName());
}else {
return "redirect:/";
}
}*/
LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기
SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기
if (loginVO == null || ssoLoginVO == null) {
//이전 url 처리(beforeSiteUrl)_이준호_220228추가
return checkLoginUtil.getUserLoginPage(model, request); //로그인 정보가 없으면 로그인 페이지로 이동한다.
}
boardVO.setNtcrId(loginVO.getUniqId());
boardVO.setNtcrNm(loginVO.getMembName());
/*UserVO userVO = new UserVO();
if(null != request.getSession().getAttribute("userVO")) { //세션체크
@ -2255,7 +2270,7 @@ public class EgovBBSManageController {
redirectAttributes.addAttribute("bbsId", boardVO.getBbsId());
redirectAttributes.addFlashAttribute("message", egovMessageSource.getMessage("success.common.delete"));
/*return "redirect:/web/cop/bbsWeb/selectBoardList.do";*/
return "redirect:/web/cop/bbs/selectBoardList2024.do";
return "redirect:/web/cop/bbsWeb/selectBoardList.do";
}
/**

3
src/main/java/kcc/web/MainController.java
View File

@ -1450,8 +1450,7 @@ public class MainController {
tempMenuManageVO.setSearchCondition("Y");
//현재 메뉴
setViewMenu(request , commandMap , tempMenuManageVO , resultVO , menuManageVO );
String pageUrl = request.getRequestURI().replaceAll(request.getContextPath(), "");
String pageUri = pageUrl.substring(0, pageUrl.lastIndexOf("/"));

2
src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMainMenu_SQL_Postgresql.xml
View File

@ -132,7 +132,7 @@
'' AS menuCours
/*getMenuCours(MENU_NO) AS menuCours*/
FROM LETTNMENUINFO
WHERE CAST(UPPER_MENU_NO AS VARCHAR) = #menuNo#;
WHERE UPPER_MENU_NO = #menuNo#;
]]>
</select>
</sqlMap>

4
src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp
View File

@ -299,10 +299,10 @@ function fn_egov_inqire_BBSMngInqire() {
<form:errors path="posblAtchFileSize" cssClass="error" />
</td>
</tr>
<tr style="display:none;">
<tr>
<th><span class="reqArea">방문자 글쓰기 사용여부</span></th>
<td>
<select id="useAt" name="writeYn" title="방문자 글쓰기 사용여부">
<select class="sel_type1" id="useAt" name="writeYn" title="방문자 글쓰기 사용여부">
<option value="Y" >사용</option>
<option value="N" selected='selected' >미사용</option>
</select>

4
src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp
View File

@ -369,8 +369,8 @@ $( document ).ready(function() {
</td>
</tr>
<tr style="display:none;">
<th><span class="reqArea">방문자 글쓰기 사용여부</span></th>
<tr>
<th><span class="sel_type1">방문자 글쓰기 사용여부</span></th>
<td>
<select id="useAt" name="writeYn" title="방문자 글쓰기 사용여부" class="sel_type1">
<option value="Y" <c:if test="${boardMaster.writeYn eq 'Y'}">selected="selected"</c:if> >사용</option>

7
src/main/webapp/WEB-INF/jsp/web/com/webCommonNaviWrap.jsp
View File

@ -30,11 +30,16 @@ $(document).ready(function (){
</script>
<!-- 데이터 셋팅 -->
<c:forEach var="resultListTit" items="${menuResultList}" varStatus="status">
<%--<c:forEach var="resultListTit" items="${menuResultList}" varStatus="status">
<c:if test="${resultListTit.depths eq '2' and fn:contains(resultListTit.url, pageUri)}" >
<!-- 조건을 만족하는 항목에 대한 처리 -->
<c:set var="upperMenuId" value="${resultListTit.upperMenuId }"/>
</c:if>
</c:forEach>--%>
<c:forEach var="resultListTit" items="${menuLeftResultList}" varStatus="status">
<c:if test="${resultListTit.depths eq '2' and fn:contains(resultListTit.url, pageUri)}" >
<c:set var="upperMenuId" value="${resultListTit.upperMenuId }"/>
</c:if>
</c:forEach>
<div class="lnb">

20
src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeList.jsp
View File

@ -45,7 +45,13 @@
document.frm.action = "<c:url value='/web/cop/bbsWeb/selectBoardDetail.do'/>";
document.frm.submit();
}
<c:if test="${brdMstrVO.writeYn eq 'Y'}">
function fn_egov_addNotice(){
document.frm.method = "post";
document.frm.action = "<c:url value='/web/cop/bbs/addBoardArticle.do'/>";
document.frm.submit();
}
</c:if>
</script>
</head>
@ -215,6 +221,18 @@
</table>
</div>
<div class="btn_wrap btn_layout01">
<div class="btn_left"></div>
<div class="btn_center"></div>
<div class="btn_right">
<%--<c:if test="${brdMstrVO.menuNo eq '9620000' || brdMstrVO.menuNo eq '9650000' || brdMstrVO.menuNo eq '99923100' || brdMstrVO.menuNo eq '99923700'}">--%>
<c:if test="${brdMstrVO.writeYn eq 'Y'}">
<button type="button" class="btnType01" onclick="javascript:fn_egov_addNotice(); return false;">글쓰기</button>
</c:if>
<%--</c:if>--%>
</div>
</div>
<c:if test="${!empty resultList}">
<div class="page">
<ui:pagination paginationInfo="${paginationInfo}" type="imageWeb" jsFunction="linkPage"/>

4
src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeRegist.jsp
View File

@ -61,8 +61,8 @@
document.searchForm.action = "<c:url value='/web/cop/bbs/QnaList.do'/>";
</c:if>
*/
/* document.searchForm.action = "<c:url value='/web/cop/bbsWeb/selectBoardList.do'/>"; */
document.searchForm.action = "<c:url value='/web/cop/bbs/selectBoardList2024.do'/>";
document.searchForm.action = "<c:url value='/web/cop/bbsWeb/selectBoardList.do'/>";
<%--document.searchForm.action = "<c:url value='/web/cop/bbs/selectBoardList2024.do'/>";--%>
document.searchForm.submit();
}

2
src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeUpdt.jsp
View File

@ -130,7 +130,7 @@
/* <c:if test="${brdMstrVO.menuNo == '9620000'}">
document.searchForm.action = "<c:url value='/web/cop/bbs/QnaList.do'/>";
</c:if> */
document.searchForm.action = "<c:url value='/web/cop/bbs/selectBoardList2024.do'/>";
document.searchForm.action = "<c:url value='/web/cop/bbsWeb/selectBoardList.do'/>";
document.searchForm.submit();
}

2
src/main/webapp/WEB-INF/jsp/web/main/mainPage_bak_250915.jsp
View File

@ -348,7 +348,7 @@ function instrChk(){
-->
</ul>
</div>
<a href="<c:url value='/web/cop/bbs/selectBoardList2024.do?bbsId=BBSMSTR_000000000653'/>" class="btn_plus">더보기</a>
<a href="<c:url value='/web/cop/bbsWeb/selectBoardList.do?bbsId=BBSMSTR_000000000653'/>" class="btn_plus">더보기</a>
</div>
<!-- 교육자료실 -->