From c421df449709435453e38b3b9430b886ba9985bc 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: Wed, 22 Nov 2023 16:36:28 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B1=B4=EC=84=A4=EA=B8=B0=EC=A4=80=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EA=B2=80=EC=83=89?=
 =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EC=85=80=EB=A0=89=ED=8A=B8=EB=B0=95?=
 =?UTF-8?q?=EC=8A=A4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/standardCode/StandardCodeList.jsx   | 30 +++++++++----------
 .../standardCode/StandardCodeController.java  |  4 +++
 .../standardCode/entity/TnDocumentInfo.java   |  2 ++
 3 files changed, 20 insertions(+), 16 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 7a32865..c5271a9 100644
--- a/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx
+++ b/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx
@@ -76,7 +76,7 @@ function StandardCodeList(props) {
     const bbsId = location.state?.bbsId || NOTICE_BBS_ID;
 
     // eslint-disable-next-line no-unused-vars
-    const [searchCondition, setSearchCondition] = useState(location.state?.searchCondition || { listCode: listCode, pageIndex: 1, searchCnd: '0', searchWrd: '' });// 기존 조회에서 접근 했을 시 || 신규로 접근 했을 시
+    const [searchCondition, setSearchCondition] = useState(location.state?.searchCondition || { listCode: listCode, pageIndex: 1, searchCnd: '', searchWrd: '' });// 기존 조회에서 접근 했을 시 || 신규로 접근 했을 시
     const [masterBoard, setMasterBoard] = useState({});
     const [paginationInfo, setPaginationInfo] = useState({});
 
@@ -151,19 +151,6 @@ function StandardCodeList(props) {
                         {/* <!-- 검색조건 --> */}
                         <div className="condition">
                             <ul>
-                                <li className="third_1 L">
-                                    <label className="f_select" htmlFor="sel1">
-                                        <select id="sel1" title="조건" defaultValue={searchCondition.searchCnd} ref={cndRef}
-                                                onChange={e => {
-                                                    cndRef.current.value = e.target.value;
-                                                }}
-                                        >
-                                            <option value="0">제목</option>
-                                            <option value="1">내용</option>
-                                            <option value="2">작성자</option>
-                                        </select>
-                                    </label>
-                                </li>
                                 <li className="third_2 R">
                                     <span className="f_search w_500">
                                         <input type="text" name="" defaultValue={searchCondition.searchWrd} placeholder="코드명" ref={wrdRef}
@@ -178,8 +165,19 @@ function StandardCodeList(props) {
                                                 }}>조회</button>
                                     </span>
                                 </li>
-                                <li>
-                                    <Link to={URL.INFORM_NOTICE_CREATE} state={{bbsId: bbsId}} className="btn btn_blue_h46 pd35">등록</Link>
+                                <li className="third_1 L">
+                                    <label className="f_select" htmlFor="sel1">
+                                        <select id="sel1" title="조건" defaultValue={searchCondition.searchCnd} ref={cndRef}
+                                                onChange={e => {
+                                                    cndRef.current.value = e.target.value;
+                                                    retrieveList({ ...searchCondition, pageIndex: 1, searchCnd: cndRef.current.value, searchWrd: wrdRef.current.value });
+                                                }}
+                                        >
+                                            <option value="10">전체</option>
+                                            <option value="1010">공통편</option>
+                                            <option value="1020">시설물편</option>
+                                        </select>
+                                    </label>
                                 </li>
                             </ul>
                         </div>
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 d21da89..6e4ad43 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
@@ -109,6 +109,10 @@ public class StandardCodeController extends BaseController {
 		paginationInfo.setPageSize(propertyService.getInt("Globals.pageSize"));
 		resultMap.put("paginationInfo", paginationInfo);
 
+		System.out.println("@@@ searchCnd : " + tnDocumentInfo.getSearchCnd());
+		if (!tnDocumentInfo.getSearchCnd().isEmpty()) {
+			tnDocumentInfo.setListCode(tnDocumentInfo.getSearchCnd());
+		}
 		List<TnDocumentCodeList> tnDocumentCodeList = standardCodeService.selectStandardCodeList(tnDocumentInfo);
 		resultMap.put("resultList", tnDocumentCodeList);
 		Integer totCnt = tnDocumentCodeList.get(0).getContentcount();
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/entity/TnDocumentInfo.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/entity/TnDocumentInfo.java
index 6ab422d..a8a6c79 100644
--- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/entity/TnDocumentInfo.java
+++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/entity/TnDocumentInfo.java
@@ -107,4 +107,6 @@ public class TnDocumentInfo {
   private String listCode;
   @Transient
   private String searchWrd;
+  @Transient
+  private String searchCnd;
 }
\ No newline at end of file