Merge branch 'JIWOO' into advc

src/main/java/kcc/let/cop/bbs/service/BoardMaster.java

@@ -242,6 +242,8 @@ public class BoardMaster implements Serializable {
     private String searchSortCnd = "";	// 정렬 항목
    	private String searchSortOrd = "";	// 정렬 구분(오름/내림)
    	
+   	private String secretYn = "";	// 비밀글 여부 - 게시글 상세 조회 시 본인 글인지 체크 ex)ZOOM 게시판
+    
     
     /**
      * bbsAttrbCode attribute를 리턴한다.
@@ -1227,4 +1229,13 @@ public class BoardMaster implements Serializable {
 		this.tabBbsId = tabBbsId;
 	}
 
+	public String getSecretYn() {
+		return secretYn;
+	}
+
+	public void setSecretYn(String secretYn) {
+		this.secretYn = secretYn;
+	}
+	
+	
 }

src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBBSMaster_SQL_Mysql.xml

@@ -79,6 +79,7 @@
 		<result property="writeYn" column="WRITE_YN"  nullValue="" />
 		<result property="menuNm" column="MENU_NM"  nullValue="" />
 		<result property="menuNo" column="MENU_NO"  nullValue="" />
+		<result property="secretYn" column="SECRET_YN"  nullValue="" />
 
 	</resultMap>
 
@@ -360,7 +361,7 @@
 			 <isEqual property="bbsTyCode" compareValue="BBST07">
 			 	MENU_NO,
 			 </isEqual>
-			 VIEWS_YN,SE_CMMN_CD_ID
+			 VIEWS_YN,SE_CMMN_CD_ID, SECRET_YN
 			  )
 			VALUES
 			( #bbsId#, #bbsTyCode#, #bbsAttrbCode#, #bbsNm#, #bbsIntrcn#,
@@ -375,7 +376,7 @@
 			  <isEqual property="bbsTyCode" compareValue="BBST07">
 			 	'9620000',  /**사전정보공표 */
 			 </isEqual>
-			  #viewsYn#,#seCmmnCdId#
+			  #viewsYn#,#seCmmnCdId#,#secretYn#
 			 )
 	</insert>
 
@@ -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 @@
 				<isEqual property="bbsTyCode" compareValue="BBST07">
 					MENU_NO = '9620000', /**사전정보공표 */
 				</isEqual>
-			 	BBS_DC = #bbsDc#
+			 	BBS_DC = #bbsDc#,
+			 	SECRET_YN = #secretYn#
 			WHERE BBS_ID = #bbsId#
  	</update>
 

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#
 		 ]]>
+		 <isEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
+		        AND (B.AUTHOR_CODE = #authorCode#
+		 		OR B.AUTHOR_CODE = 'ROLE_USER_MEMBER'
+		 		OR B.AUTHOR_CODE = 'ROLE_USER_MANAGER')
+		 		GROUP BY A.MENU_NO
+		 </isEqual>
+		 <isNotEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
+		        AND B.AUTHOR_CODE = #authorCode#
+		 </isNotEqual>
 		    ORDER BY
 		        A.UPPER_MENU_NO,
 		        A.MENU_ORDR,

src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Mysql.xml

@@ -97,7 +97,15 @@
 			</isNotEmpty>
 
 			<isNotEmpty property="authorCode" > /* 매뉴사용여부 조회 */
-				AND B.AUTHOR_CODE =  #authorCode#
+				
+				<isEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
+					AND (B.AUTHOR_CODE =  #authorCode#
+					OR B.AUTHOR_CODE = 'ROLE_USER_MEMBER'
+			 		OR B.AUTHOR_CODE = 'ROLE_USER_MANAGER')
+				</isEqual>
+				<isNotEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
+					AND B.AUTHOR_CODE =  #authorCode#
+				</isNotEqual>
 			</isNotEmpty>
 			LIMIT 1
 	</select>

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

@@ -318,6 +318,16 @@ function fn_egov_inqire_BBSMngInqire() {
 									<form:errors path="viewsYn" cssClass="error" />
 								</td>
 							</tr>
+							<tr>
+								<th><span class="reqArea">비공개 여부</span></th>
+								<td>
+									<form:select path="secretYn" title="비공개 여부">
+										<form:option value="Y">사용</form:option>
+										<form:option value='N' selected="selected">미사용</form:option>
+									</form:select>
+									<form:errors path="secretYn" cssClass="error" />
+								</td>
+							</tr>
 							<tr>
 								<th><span class="reqArea">게시판 사용여부</span></th>
 								<td>

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

@@ -379,6 +379,17 @@ $( document ).ready(function() {
 								</td>
 							</tr>
 							
+							<tr>
+								<th><span class="reqArea">비공개 여부</span></th>
+								<td>
+									<form:select path="secretYn" title="비공개 여부" class="sel_type1">
+										<form:option value="Y">사용</form:option>
+										<form:option value='N'>미사용</form:option>
+									</form:select>
+									<form:errors path="secretYn" cssClass="error" />
+								</td>
+							</tr>
+							
 							<tr>
 								<th><span class="reqArea">게시판 사용여부</span></th>
 								<td>