From 4baabd6d6bb23dad35b0af317b0b2d44db5fc21b Mon Sep 17 00:00:00 2001 From: myname Date: Thu, 18 Jan 2024 16:26:12 +0900 Subject: [PATCH] =?UTF-8?q?2024-01-18=2016:25=20zoom=20=EA=B2=8C=EC=8B=9C?= =?UTF-8?q?=ED=8C=90=20=EC=9E=91=EC=84=B1=EC=9E=90=20=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=EB=A7=8C=20=EB=82=98=EC=98=A4=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kcc/let/cop/bbs/web/EgovBBSManageController.java | 9 +++++++++ .../stngInfo/service/impl/VEAStngMixServiceImpl.java | 2 +- src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp | 2 +- src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp | 8 +++++++- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java b/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java index e3fe48b2..3fdb0767 100644 --- a/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java +++ b/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java @@ -1237,6 +1237,15 @@ public class EgovBBSManageController { boardVO.setSearchSortOrd("desc"); } + if("BBSMSTR_000000000725".equals(bmVO.getBbsId())) { //zoom 신청 게시판 + System.out.println("zoom 신청 게시판"); + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + boardVO.setFrstRegisterId(userId); + } + + + System.out.println("bmVO.getBbsTyCode()"); System.out.println(bmVO.getBbsTyCode()); System.out.println(bmVO.getBbsId()); diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixServiceImpl.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixServiceImpl.java index d5e73588..76c57c8f 100644 --- a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixServiceImpl.java +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixServiceImpl.java @@ -235,7 +235,7 @@ public class VEAStngMixServiceImpl implements VEAStngMixService { }else { //위 날짜에 부합하는 데이터가 없는 경우 flag 변경 처리 - //가능한 기간에 값이 있고, 불가능한 기간에 값이 없음 + //가능한 기간에 값이 있고(해당 회차의 교육가능 기간체크), 불가능한 기간에 값이 없음(등록된 불가능일 또는 토/일) if (Integer.parseInt(dateVO.getDpStrtDt())>0 && Integer.parseInt(dateVO.getDpDdlnDt())<=0){ ; diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp index 44a98f47..b1d3eb12 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp @@ -58,7 +58,7 @@ function footerSiteLinkPageGo (){

한국저작권위원회 저작권배움터

진주 [52852] 경상남도 진주시 소호로 117, 1/2/5층 ☎ 055-792-0000

-

☎ 찾교(청소년) 055.792.0224 / 찾교(성인) 02.2669.0083 / 체험교실 055.792.0234 / 교육조건부기소유예제 055.79.0223

+

☎ 찾교(청소년) 055.792.0224 / 찾교(성인) 02.2669.0083 / 체험교실 055.792.0234 / 교육조건부기소유예제 055.792.0223

    실무역량강화 02.2669.0082

서울 [04323] 서울특별시 용산구 후암로 107, 5/16층 ☎ 대표번호 02.2669.0010

diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp index 1b95eaa0..b784c6db 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -341,7 +341,13 @@ function usrJoin(){
- + + + + + + +