From dc59f66c1129c9f95798ffadb79ccc6c8918b1f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Thu, 4 Jan 2024 16:43:56 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BD=94=EB=93=9C=EA=B4=80=EB=A6=AC=20?=
 =?UTF-8?q?=EC=9E=91=EC=97=85=EC=99=84=EB=A3=8C.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/admin/config/baseCode/ChildCodeDiv.jsx  | 11 ++++++-----
 .../src/pages/admin/config/baseCode/ParentCodeDiv.jsx |  4 ++--
 .../admin/config/service/AdminConfigService.java      |  1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/config/baseCode/ChildCodeDiv.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/config/baseCode/ChildCodeDiv.jsx
index d4cf932..150d5ec 100644
--- a/egovframe-template-simple-react-contribution/src/pages/admin/config/baseCode/ChildCodeDiv.jsx
+++ b/egovframe-template-simple-react-contribution/src/pages/admin/config/baseCode/ChildCodeDiv.jsx
@@ -62,7 +62,7 @@ function ChildCodeDiv({}, ref){
                     },
                     body: JSON.stringify({
                         itemCd: itemCd.value,
-                        grpCd: document.querySelector("#grpCd").value,
+                        grpCd: document.querySelector("#codeItemDiv").querySelector("#grpCd").value,
                         itemNm: itemNm.value,
                         grpOrder: grpOrder.value
                     })
@@ -90,8 +90,9 @@ function ChildCodeDiv({}, ref){
 
     function modifyCodeItem(e, action){
         const row = e.target.parentElement.parentElement;
+        const selectedGrpCd = document.querySelector("#codeItemDiv").querySelector("#grpCd").value;
         const codeItem = {
-            grpCd: document.querySelector("#grpCd").value,
+            grpCd: selectedGrpCd,
             itemCd: row.querySelector(".itemCd").value,
             itemNm: row.querySelector(".itemNm").value,
             grpOrder: row.querySelector(".grpOrder").value,
@@ -109,7 +110,7 @@ function ChildCodeDiv({}, ref){
             (resp) => {
                 switch (resp.resultCode) {
                     case Number(CODE.RCV_SUCCESS):
-                        getCodeItemList(grpCd);
+                        getCodeItemList(selectedGrpCd);
                         break;
                     case Number(CODE.RCV_ERROR_SAVE)||Number(CODE.RCV_ERROR_AUTH):
                         alert(resp.resultMessage);
@@ -124,8 +125,8 @@ function ChildCodeDiv({}, ref){
     }
 
     return (
-        <Container className={"pt-3"}>
-            <input type={"text"} id={"grpCd"} value={grpCd}/>
+        <Container className={"pt-3"} id={"codeItemDiv"}>
+            <input type={"hidden"} id={"grpCd"} value={grpCd}/>
             <Row className={"py-2 bg-light border-bottom"}>
                 <Col xs={3}>코드</Col>
                 <Col xs={4}>코드명</Col>
diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/config/baseCode/ParentCodeDiv.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/config/baseCode/ParentCodeDiv.jsx
index 417daf1..8d1e5de 100644
--- a/egovframe-template-simple-react-contribution/src/pages/admin/config/baseCode/ParentCodeDiv.jsx
+++ b/egovframe-template-simple-react-contribution/src/pages/admin/config/baseCode/ParentCodeDiv.jsx
@@ -79,7 +79,7 @@ function ParentCodeDiv({getCodeItem}){
                             grpCd.value = "";
                             grpCdNm.value = "";
                             getCodeGrp();
-                            codeGrpChoose();
+                            getCodeItem();
                             break;
                         case Number(CODE.RCV_ERROR_SAVE)||Number(CODE.RCV_ERROR_AUTH):
                             alert(resp.resultMessage);
@@ -114,7 +114,7 @@ function ParentCodeDiv({getCodeItem}){
                 switch (resp.resultCode) {
                     case Number(CODE.RCV_SUCCESS):
                         getCodeGrp();
-                        codeGrpChoose();
+                        getCodeItem();
                         break;
                     case Number(CODE.RCV_ERROR_SAVE)||Number(CODE.RCV_ERROR_AUTH):
                         alert(resp.resultMessage);
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/service/AdminConfigService.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/service/AdminConfigService.java
index 26b3790..1e140d2 100644
--- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/service/AdminConfigService.java
+++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/service/AdminConfigService.java
@@ -89,6 +89,7 @@ public class AdminConfigService extends EgovAbstractServiceImpl {
       savedItem.setItemNm(codeItem.getItemNm());
       savedItem.setLastChgId(codeItem.getLastChgId());
       savedItem.setLastChgDt(codeItem.getLastChgDt());
+      savedItem.setGrpOrder(codeItem.getGrpOrder());
       savedItem.setUseYn(codeItem.getUseYn());
       codeItemRepository.save(savedItem);
       return "modified";