From 2257db82b4dfb1396d516b9c3f17a630c1d6597c Mon Sep 17 00:00:00 2001 From: KNKIM Date: Fri, 22 Oct 2021 10:13:12 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=EB=B3=84=20?= =?UTF-8?q?=EB=AC=B8=ED=99=94=EC=9B=90=EB=B3=84=20=ED=91=9C=EC=B6=9C=20?= =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EC=A0=81=EC=9A=A9=20(=EC=9A=94=EC=B2=AD?= =?UTF-8?q?=20:=202021.10.20=20=EA=B9=80=EC=A7=84=EC=98=81=EC=B0=A8?= =?UTF-8?q?=EC=9E=A5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/nlib/bbs/web/FaqController.java | 1 + .../java/nlib/cmm/NlibCommonController.java | 19 ++----------------- .../nlib/cmm/interceptor/NlibInterceptor.java | 13 ++++++++----- .../mapper/nlib/bbs/AncmntDAO_SQL.xml | 8 ++++---- .../mapper/nlib/bbs/FaqDAO_SQL.xml | 9 +++++---- .../mapper/nlib/bbs/QnaDAO_SQL.xml | 8 ++++---- src/main/resources/nlib/nlib.properties | 2 +- 7 files changed, 25 insertions(+), 35 deletions(-) diff --git a/src/main/java/nlib/bbs/web/FaqController.java b/src/main/java/nlib/bbs/web/FaqController.java index d4cae7a1..8111668e 100644 --- a/src/main/java/nlib/bbs/web/FaqController.java +++ b/src/main/java/nlib/bbs/web/FaqController.java @@ -85,6 +85,7 @@ public class FaqController extends NlibCommonController { if(searchArticleVO.getPageIndex() < 1) searchArticleVO.setPageIndex(1); if(searchArticleVO.getPageSize() < 1) searchArticleVO.setPageSize(DEFUALT_PAGE_SIZE); + searchArticleVO.setMngOrgCd(getCurCouncilCd(req)); List list = faqService.listArticles(searchArticleVO); diff --git a/src/main/java/nlib/cmm/NlibCommonController.java b/src/main/java/nlib/cmm/NlibCommonController.java index 2374d2d9..95124c1e 100644 --- a/src/main/java/nlib/cmm/NlibCommonController.java +++ b/src/main/java/nlib/cmm/NlibCommonController.java @@ -24,6 +24,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import nlib.cmm.exception.ErrorMessage; +import nlib.cmm.service.NlibProperty; import nlib.restful.service.DataApiResVO; import nlib.security.SecUserVO; import nlib.user.service.LoginService; @@ -360,23 +361,7 @@ public class NlibCommonController { private String getCurCouncilInfo(HttpServletRequest request, int which) { HttpSession session = request.getSession(); - String councilInfo = (String)session.getAttribute( (which == INFO_ID_COUNCIL_CD ? "curCouncilCd" : "curCouncilNm")); - if(StringUtil.isNotEmpty(councilInfo)) { - return councilInfo; - } - - // 지방문화원 코드 확인 - String curCouncilDnsHost = StringUtil.getHostName(request.getRequestURL().toString()); - HashMap councilInfoMap = _loginService.selectCouncilInfoByDnsHost(curCouncilDnsHost); - - String curCouncilCd = councilInfoMap.get("councilCd"); - String curCouncilNm = councilInfoMap.get("councilNm"); - - session.setAttribute("curCouncilNm", curCouncilNm); - session.setAttribute("curCouncilCd", curCouncilCd); - session.setAttribute("curCouncilDnsHost", curCouncilDnsHost); - - return which == INFO_ID_COUNCIL_CD ? curCouncilCd : curCouncilNm; + return (String)session.getAttribute( (which == INFO_ID_COUNCIL_CD ? "councilCd" : "councilNm")); } public String getCurCouncilCd(HttpServletRequest request) { diff --git a/src/main/java/nlib/cmm/interceptor/NlibInterceptor.java b/src/main/java/nlib/cmm/interceptor/NlibInterceptor.java index f9582ca7..bf3a9f30 100644 --- a/src/main/java/nlib/cmm/interceptor/NlibInterceptor.java +++ b/src/main/java/nlib/cmm/interceptor/NlibInterceptor.java @@ -53,17 +53,20 @@ public class NlibInterceptor extends HandlerInterceptorAdapter { HttpSession session = request.getSession(); log.debug("preHandle > sessionid=" + session.getId()); String councilCd = (String)session.getAttribute("councilCd"); + String councilNm = (String)session.getAttribute("councilNm"); if(StringUtil.isEmpty(councilCd)) { // 지방문화원 코드 확인 String councilDnsHost = StringUtil.getHostName(request.getRequestURL().toString()); HashMap councilInfoMap = loginService.selectCouncilInfoByDnsHost(councilDnsHost); councilCd = councilInfoMap.get("councilCd"); - if(!StringUtil.equalsIgnoreCase(NlibProperty.getString("nlib.council.cd"), councilCd)) { - session.setAttribute("councilCd" , councilCd); - session.setAttribute("councilNm" , councilInfoMap.get("councilNm")); - session.setAttribute("councilDnsHost", councilDnsHost); - } + + if(StringUtil.isEmpty(councilCd)) councilCd = NlibProperty.getString("nlib.council.cd"); + if(StringUtil.isEmpty(councilNm)) councilNm = NlibProperty.getString("nlib.council.nm"); + + session.setAttribute("councilCd" , councilCd); + session.setAttribute("councilNm" , councilNm); + session.setAttribute("councilDnsHost", councilDnsHost); } return true; 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 31cfc980..88cae262 100644 --- a/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml @@ -3,10 +3,11 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -20,7 +21,6 @@ AND S.CONTENT LIKE CONCAT('%', #{escapeSearchKeyword}, '%') - AND S.MNG_ORG_CD IN (#{mngOrgCd}, 'KCCF') AND IFNULL(S.DELETE_YN, 'N') = 'N' @@ -46,7 +46,7 @@ SELECT S.ANCMNT_ID , ROW_NUMBER() OVER(PARTITION BY 1 ORDER BY S.REG_DD, S.TITLE) AS RNO , ROW_NUMBER() OVER(PARTITION BY 1 ORDER BY S.REG_DD DESC, S.TITLE DESC) AS ONO - + ) S2 WHERE ONO BETWEEN (#{pageStartRowNum} + 1) AND (#{pageStartRowNum} + #{pageSize}) ) AS A2 @@ -61,7 +61,7 @@ SELECT COUNT(1) - + @@ -53,7 +53,7 @@ SELECT S.QNA_ID , ROW_NUMBER() OVER(PARTITION BY 1 ORDER BY S.REG_DD, S.TITLE) AS RNO , ROW_NUMBER() OVER(PARTITION BY 1 ORDER BY S.REG_DD DESC, S.TITLE DESC) AS ONO - + ) S2 WHERE ONO BETWEEN (#{pageStartRowNum} + 1) AND (#{pageStartRowNum} + #{pageSize}) ) AS A2 @@ -74,7 +74,7 @@