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 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 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 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}, '%') + AND S.MNG_ORG_CD IN (#{mngOrgCd}, 'KCCF') 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 @@ AND S.REG_ID = #{searchMbInfoId} - + AND S.MNG_ORG_CD IN (#{mngOrgCd}, 'KCCF')