From 3e4443b28c7b124eff929d06095373d0b43b442c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A0=EB=AF=BC=ED=98=95?= Date: Thu, 7 Dec 2023 17:24:51 +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=EC=A4=91=EB=B6=84=EB=A5=98=20=EC=88=98=EC=A0=95,=20?= =?UTF-8?q?=EB=AF=B8=EC=82=AC=EC=9A=A9=20=EB=B3=80=EC=88=98=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/standardCode/StandardCodeList.jsx | 12 +----------- .../standardCode/StandardCodeController.java | 2 +- 2 files changed, 2 insertions(+), 12 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 9c148da..fcd0bdb 100644 --- a/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx @@ -3,10 +3,6 @@ import {Link, useLocation, useParams} from 'react-router-dom'; import * as EgovNet from 'api/egovFetch'; import URL from 'constants/url'; -import {NOTICE_BBS_ID} from 'config'; - -import {itemIdxByPage} from 'utils/calc'; - import {StandardCodeListModal, StandardCodeListModalTable} from './StandardCodeListModal' import {AiFillFileMarkdown, AiFillStar} from "react-icons/ai"; @@ -77,8 +73,6 @@ function StandardCodeList(props) { const category2Ref = useRef(); const wrdRef = useRef(); - const bbsId = location.state?.bbsId || NOTICE_BBS_ID; - // eslint-disable-next-line no-unused-vars const [searchCondition, setSearchCondition] = useState(location.state?.searchCondition || { pageIndex: 1, @@ -88,9 +82,6 @@ function StandardCodeList(props) { searchWrd: '' });// 기존 조회에서 접근 했을 시 || 신규로 접근 했을 시 const [masterBoard, setMasterBoard] = useState({}); - const [paginationInfo, setPaginationInfo] = useState({}); - - const [listTag, setListTag] = useState([]); /* 검색기능 추가 변수*/ const [listdata, setlistdata] = useState([]); @@ -128,7 +119,6 @@ function StandardCodeList(props) { requestOptions, (resp) => { setMasterBoard(resp.result.tnDocumentInfo); - setPaginationInfo(resp.result.paginationInfo); /*검색을 위한 리스트 state에 저장*/ setlistdata(resp.result.resultList); setCategoryList(resp.result.categoryList); @@ -281,7 +271,7 @@ function StandardCodeList(props) {
{item.middleCategory}
{item.kcscCd}
{item.groupNm}
-
개정이력
+
개정이력
{item.contentcount > 0 ? 내용보기 : null}
{item.docFileGrpId == null ? null : }
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 47cf482..c7cda54 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 @@ -163,7 +163,7 @@ public class StandardCodeController extends BaseController { System.out.println("@@@ tab : " + tnDocumentInfo.getTab()); if (!tnDocumentInfo.getCategory1().isEmpty()) { - tnDocumentInfo.setListCode(tnDocumentInfo.getTab() + tnDocumentInfo.getCategory1()); + tnDocumentInfo.setListCode(tnDocumentInfo.getTab() + tnDocumentInfo.getCategory1() + tnDocumentInfo.getCategory2()); } Integer groupFullCd = standardCodeService.selectStandardCodeGroupSeq(tnDocumentInfo.getTab() + tnDocumentInfo.getCategory1());