From 2e685876f1bc9edc15c7c65609d979d573f52c48 Mon Sep 17 00:00:00 2001
From: KNKIM <knkim@digitalship.co.kr>
Date: Mon, 18 Oct 2021 09:09:07 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A0=91=EC=86=8D=20=EB=AC=B8=ED=99=94?=
 =?UTF-8?q?=EC=9B=90=EB=B3=84=20=ED=91=9C=EC=B6=9C=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/nlib/bbs/web/AncmntController.java           | 5 +++--
 src/main/java/nlib/bbs/web/QnaController.java              | 7 ++++---
 .../egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml        | 1 +
 .../resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/nlib/bbs/web/AncmntController.java b/src/main/java/nlib/bbs/web/AncmntController.java
index 7639cdd2..a5654163 100644
--- a/src/main/java/nlib/bbs/web/AncmntController.java
+++ b/src/main/java/nlib/bbs/web/AncmntController.java
@@ -59,17 +59,18 @@ public class AncmntController extends NlibCommonController
 	/**
 	 * 목록 조회한다.
 	 * 
-	 * @param req
+	 * @param request
 	 * @return
 	 */
 	@RequestMapping(value="/bbs/listAncmntsAjax.do")
 	public ResponseEntity<String> listAncmntsAjax(
-			HttpServletRequest req, 
+			HttpServletRequest request, 
 			Authentication authentication,
 			@RequestBody ArticleVO searchArticleVO) throws Exception {
 
 		if(searchArticleVO.getPageIndex() < 1) searchArticleVO.setPageIndex(1);
 		if(searchArticleVO.getPageSize() < 1) searchArticleVO.setPageSize(DEFUALT_PAGE_SIZE);
+		searchArticleVO.setMngOrgCd(getCurCouncilCd(request));
 		
 		List<ArticleVO> list = ancmntService.listArticles(searchArticleVO);
 		
diff --git a/src/main/java/nlib/bbs/web/QnaController.java b/src/main/java/nlib/bbs/web/QnaController.java
index c5466dd4..5c653240 100644
--- a/src/main/java/nlib/bbs/web/QnaController.java
+++ b/src/main/java/nlib/bbs/web/QnaController.java
@@ -74,12 +74,12 @@ public class QnaController extends NlibCommonController {
 	/**
 	 * 목록 조회한다.
 	 * 
-	 * @param req
+	 * @param request
 	 * @return
 	 */
 	@RequestMapping(value="/bbs/listQnasAjax.do")
 	public ResponseEntity<String> listQnasAjax(
-			HttpServletRequest req, 
+			HttpServletRequest request, 
 			Authentication authentication,
 			@RequestBody ArticleVO searchArticleVO) throws Exception {
 
@@ -88,8 +88,9 @@ public class QnaController extends NlibCommonController {
 		
 		if(searchArticleVO.getPageIndex() < 1) searchArticleVO.setPageIndex(1);
 		if(searchArticleVO.getPageSize() < 1) searchArticleVO.setPageSize(DEFUALT_PAGE_SIZE);
+		searchArticleVO.setMngOrgCd(getCurCouncilCd(request));
 		
-		String mbInfoId = getMbInfoId(req);
+		String mbInfoId = getMbInfoId(request);
 		searchArticleVO.setLoginedMbInfoId(mbInfoId);
 		if(StringUtil.equalsIgnoreCase(searchArticleVO.getSearchQuestionType(), "USER")) {
 			searchArticleVO.setSearchMbInfoId(mbInfoId);
diff --git a/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml
index b2ff2615..5c3f0e6a 100644
--- a/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml
+++ b/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml
@@ -20,6 +20,7 @@
             AND S.CONTENT LIKE CONCAT('%', #{escapeSearchKeyword}, '%')
             </if>
         </if>
+        AND S.MNG_ORG_CD IN (#{mngOrgCd}, 'KCCF')
         
     </sql>
     
diff --git a/src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml
index dbebbdfa..e57170d3 100644
--- a/src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml
+++ b/src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml
@@ -23,7 +23,7 @@
         <if test='searchMbInfoId != null and !searchMbInfoId.equals("")'>
             AND S.REG_ID = #{searchMbInfoId}
         </if>
-        
+        AND S.MNG_ORG_CD IN (#{mngOrgCd}, 'KCCF')
     </sql>
     
  	<select id="listArticles" parameterType="ArticleVO" resultType="ArticleVO">