From 00ef66d450494a3528d4fb6f5f2b878735e69e7a Mon Sep 17 00:00:00 2001 From: jiwoo Date: Tue, 4 Jul 2023 16:51:04 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EB=A9=94=EB=89=B4=EA=B4=80=EB=A6=AC,=20?= =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EB=93=B1=EB=A1=9D/=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EC=8B=9C=20=EB=B9=84=EA=B3=B5=EA=B0=9C=20=EC=97=AC?= =?UTF-8?q?=EB=B6=80=20=ED=95=AD=EB=AA=A9=20=EC=B6=94=EA=B0=80.=20?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EA=B4=80=EB=A6=AC=20:=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EB=A9=94=EB=89=B4=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EC=8B=9C=20=EB=B0=A9=EB=AC=B8=EC=9E=90=20=EA=B6=8C=ED=95=9C?= =?UTF-8?q?=EC=97=90=20=EC=82=AC=EC=9A=A9=EC=9E=90=20=EA=B6=8C=ED=95=9C?= =?UTF-8?q?=EB=8F=84=20=EA=B0=99=EC=9D=B4=20=EC=A1=B0=ED=9A=8C=20=ED=95=98?= =?UTF-8?q?=EA=B2=8C=EB=81=94=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kcc/let/cop/bbs/service/BoardMaster.java | 11 +++++++++++ .../sqlmap/let/cop/bbs/EgovBBSMaster_SQL_Mysql.xml | 9 ++++++--- .../let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml | 10 +++++++++- .../let/sym/mnu/mpm/EgovMenuManage_SQL_Mysql.xml | 10 +++++++++- .../WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp | 10 ++++++++++ .../webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp | 11 +++++++++++ 6 files changed, 56 insertions(+), 5 deletions(-) diff --git a/src/main/java/kcc/let/cop/bbs/service/BoardMaster.java b/src/main/java/kcc/let/cop/bbs/service/BoardMaster.java index 1d383601..efdcf18b 100644 --- a/src/main/java/kcc/let/cop/bbs/service/BoardMaster.java +++ b/src/main/java/kcc/let/cop/bbs/service/BoardMaster.java @@ -241,6 +241,8 @@ public class BoardMaster implements Serializable { private String searchSortCnd = ""; // 정렬 항목 private String searchSortOrd = ""; // 정렬 구분(오름/내림) + + private String secretYn = ""; // 비밀글 여부 - 게시글 상세 조회 시 본인 글인지 체크 ex)ZOOM 게시판 /** @@ -1226,5 +1228,14 @@ public class BoardMaster implements Serializable { public void setTabBbsId(String tabBbsId) { this.tabBbsId = tabBbsId; } + + public String getSecretYn() { + return secretYn; + } + + public void setSecretYn(String secretYn) { + this.secretYn = secretYn; + } + } \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBBSMaster_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBBSMaster_SQL_Mysql.xml index a76e62c3..b852e38f 100644 --- a/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBBSMaster_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBBSMaster_SQL_Mysql.xml @@ -79,6 +79,7 @@ + @@ -360,7 +361,7 @@ MENU_NO, - VIEWS_YN,SE_CMMN_CD_ID + VIEWS_YN,SE_CMMN_CD_ID, SECRET_YN ) VALUES ( #bbsId#, #bbsTyCode#, #bbsAttrbCode#, #bbsNm#, #bbsIntrcn#, @@ -375,7 +376,7 @@ '9620000', /**사전정보공표 */ - #viewsYn#,#seCmmnCdId# + #viewsYn#,#seCmmnCdId#,#secretYn# ) @@ -411,6 +412,7 @@ a.DELETE_AUTH , a.VIEWS_YN, a.BBS_DC, + a.SECRET_YN, '' as MENU_COURS, /*REPLACE(GETMENUCOURS(h.MENU_NO), '|', ' > ') as MENU_COURS,*/ /*get1DepthMenuNo(h.MENU_NO) as FIRST_DEPT_MENU_NO,*/ @@ -514,7 +516,8 @@ MENU_NO = '9620000', /**사전정보공표 */ - BBS_DC = #bbsDc# + BBS_DC = #bbsDc#, + SECRET_YN = #secretYn# WHERE BBS_ID = #bbsId# diff --git a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml index f423c0a2..13f68fab 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml @@ -209,8 +209,16 @@ LETTNMENUINFO A INNER JOIN LETTNMENUCREATDTLS B on A.MENU_NO = B.MENU_NO WHERE A.MENU_NO > 0 - AND B.AUTHOR_CODE = #authorCode# ]]> + + AND (B.AUTHOR_CODE = #authorCode# + OR B.AUTHOR_CODE = 'ROLE_USER_MEMBER' + OR B.AUTHOR_CODE = 'ROLE_USER_MANAGER') + GROUP BY A.MENU_NO + + + AND B.AUTHOR_CODE = #authorCode# + ORDER BY A.UPPER_MENU_NO, A.MENU_ORDR, diff --git a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Mysql.xml index b4a90ca5..93ac28fd 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Mysql.xml @@ -97,7 +97,15 @@ /* 매뉴사용여부 조회 */ - AND B.AUTHOR_CODE = #authorCode# + + + AND (B.AUTHOR_CODE = #authorCode# + OR B.AUTHOR_CODE = 'ROLE_USER_MEMBER' + OR B.AUTHOR_CODE = 'ROLE_USER_MANAGER') + + + AND B.AUTHOR_CODE = #authorCode# + LIMIT 1 diff --git a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp index eb4f5fd6..85c7b886 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp @@ -318,6 +318,16 @@ function fn_egov_inqire_BBSMngInqire() { + + 비공개 여부 + + + 사용 + 미사용 + + + + 게시판 사용여부 diff --git a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp index e06b7c0c..c6374fba 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp @@ -379,6 +379,17 @@ $( document ).ready(function() { + + 비공개 여부 + + + 사용 + 미사용 + + + + + 게시판 사용여부