From acd01abd7771d625964111279a4e80bc3c0292bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9C=A0=EB=AF=BC=ED=98=95?= <mhyu@dbnt.co.kr>
Date: Mon, 11 Dec 2023 13:15:39 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BD=94=EB=93=9C=EB=A6=AC=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=20=EB=8C=80=EB=B6=84=EB=A5=98=20=EC=B2=B4=EC=9D=B8=EC=A7=80=20?=
 =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EC=88=98=EC=A0=95,=20=EC=B9=B4?=
 =?UTF-8?q?=EC=9A=B4=ED=8A=B8=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/standardCode/StandardCodeList.jsx            | 5 ++++-
 .../kcscbackend/standardCode/StandardCodeController.java   | 7 +++----
 .../main/resources/mybatisMapper/StandardCodeMapper.xml    | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx b/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx
index fcd0bdb..e61af89 100644
--- a/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx
+++ b/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx
@@ -87,6 +87,7 @@ function StandardCodeList(props) {
     const [listdata, setlistdata] = useState([]);
     const [filterData, setfilterData] = useState('');
     const [categoryList, setCategoryList] = useState([]);
+    const [resultCnt, setResultCnt] = useState(0);
 
     /* 탭 */
     const [activeTab, setActiveTab] = useState('10');
@@ -122,6 +123,7 @@ function StandardCodeList(props) {
                 /*검색을 위한 리스트 state에 저장*/
                 setlistdata(resp.result.resultList);
                 setCategoryList(resp.result.categoryList);
+                setResultCnt(resp.result.resultCnt);
                 // 리스트 항목 구성
             },
             function (resp) {
@@ -186,7 +188,7 @@ function StandardCodeList(props) {
                                         <select id="sel1" title="조건" defaultValue={listCode.substring(2, 4)} ref={category1Ref}
                                                 onChange={e => {
                                                     category1Ref.current.value = e.target.value;
-                                                    retrieveList({...searchCondition, pageIndex: 1, category1: category1Ref.current.value, searchWrd: wrdRef.current.value, tab: activeTab});
+                                                    retrieveList({...searchCondition, pageIndex: 1, category1: category1Ref.current.value, category2: '', searchWrd: wrdRef.current.value, tab: activeTab});
                                                 }}
                                         >
                                             <option value="">전체</option>
@@ -244,6 +246,7 @@ function StandardCodeList(props) {
                                 </ul>
                             </div>
                         </div>
+                        <div><span>resultCnt : {resultCnt}</span></div>
                         {/* <!-- 게시판목록 --> */}
                         <div className="board_list BRD002 code_list">
                             <div className="head">
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/StandardCodeController.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/StandardCodeController.java
index c7cda54..91e4362 100644
--- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/StandardCodeController.java
+++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/StandardCodeController.java
@@ -157,14 +157,12 @@ public class StandardCodeController extends BaseController {
 		paginationInfo.setPageSize(propertyService.getInt("Globals.pageSize"));
 		resultMap.put("paginationInfo", paginationInfo);
 
+		System.out.println("@@@ tab : " + tnDocumentInfo.getTab());
 		System.out.println("@@@ category1 : " + tnDocumentInfo.getCategory1());
 		System.out.println("@@@ category2 : " + tnDocumentInfo.getCategory2());
 		System.out.println("@@@ searchWrd : " + tnDocumentInfo.getSearchWrd());
-		System.out.println("@@@ tab : " + tnDocumentInfo.getTab());
 
-		if (!tnDocumentInfo.getCategory1().isEmpty()) {
-			tnDocumentInfo.setListCode(tnDocumentInfo.getTab() + tnDocumentInfo.getCategory1() + tnDocumentInfo.getCategory2());
-		}
+		tnDocumentInfo.setListCode(tnDocumentInfo.getTab() + tnDocumentInfo.getCategory1() + tnDocumentInfo.getCategory2());
 
 		Integer groupFullCd = standardCodeService.selectStandardCodeGroupSeq(tnDocumentInfo.getTab() + tnDocumentInfo.getCategory1());
 		System.out.println("@@@ groupFullCd : " + groupFullCd);
@@ -173,6 +171,7 @@ public class StandardCodeController extends BaseController {
 		resultMap.put("resultList", tnDocumentCodeList);
 		resultMap.put("categoryList", standardCodeService.selectStandardCodeCategoryList(groupFullCd));
 		Integer totCnt = tnDocumentCodeList.get(0).getContentcount();
+		System.out.println("@@@ resultCnt : " + totCnt);
 		resultMap.put("resultCnt", totCnt);
 		resultMap.put("user", user);
 
diff --git a/kcsc-back-end/src/main/resources/mybatisMapper/StandardCodeMapper.xml b/kcsc-back-end/src/main/resources/mybatisMapper/StandardCodeMapper.xml
index 238388a..9a2cea9 100644
--- a/kcsc-back-end/src/main/resources/mybatisMapper/StandardCodeMapper.xml
+++ b/kcsc-back-end/src/main/resources/mybatisMapper/StandardCodeMapper.xml
@@ -20,6 +20,7 @@
 
  	<select id="selectStandardCodeList" parameterType="TnDocumentInfo" resultType="TnDocumentCodeList">
 		select
+			count(*) over() as contentcount,
 			case
 				when a3.doc_level > 1 then a3.doc_code_name
 				else a2.doc_code_name
@@ -31,8 +32,7 @@
 			a.group_nm,
 			a.kcsc_cd,
 			tdi.doc_file_grp_id,
-			a.group_seq,
-			count(tdc.full_content) as contentcount
+			a.group_seq
 		from
 			tn_document_group a
 			left join tn_document_info tdi on