diff --git a/src/main/java/com/dbnt/faisp/controller/BaseController.java b/src/main/java/com/dbnt/faisp/controller/BaseController.java index 1f3b4841..6efb270c 100644 --- a/src/main/java/com/dbnt/faisp/controller/BaseController.java +++ b/src/main/java/com/dbnt/faisp/controller/BaseController.java @@ -22,7 +22,7 @@ public class BaseController { if(loginUser == null){ mav = new ModelAndView("redirect:/login"); }else{ - session.setAttribute("commonCodeList", codeMgtService.selectCodeCatgAndChild()); + session.setAttribute("commonCodeList", codeMgtService.selectCommonCodeList()); mav = new ModelAndView("redirect:/dashboard"); } return mav; @@ -30,7 +30,7 @@ public class BaseController { @GetMapping("/refreshSession") public void getSession(HttpSession session){ - session.setAttribute("commonCodeList", codeMgtService.selectCodeCatgAndChild()); + session.setAttribute("commonCodeList", codeMgtService.selectCommonCodeList()); } @GetMapping("/login") diff --git a/src/main/java/com/dbnt/faisp/repository/CodeMgtRepository.java b/src/main/java/com/dbnt/faisp/repository/CodeMgtRepository.java index 2bd46cfc..b9f33ba4 100644 --- a/src/main/java/com/dbnt/faisp/repository/CodeMgtRepository.java +++ b/src/main/java/com/dbnt/faisp/repository/CodeMgtRepository.java @@ -10,4 +10,5 @@ import java.util.Optional; public interface CodeMgtRepository extends JpaRepository { List findByCategoryCdOrderByItemCdAsc(String categoryCd); + List findByUseChkOrderByItemCdAsc(String useChk); } diff --git a/src/main/java/com/dbnt/faisp/service/CodeMgtService.java b/src/main/java/com/dbnt/faisp/service/CodeMgtService.java index c33d3757..fbe8f219 100644 --- a/src/main/java/com/dbnt/faisp/service/CodeMgtService.java +++ b/src/main/java/com/dbnt/faisp/service/CodeMgtService.java @@ -41,4 +41,8 @@ public class CodeMgtService{ } return codeCatgList; } + + public List selectCommonCodeList() { + return codeMgtRepository.findByUseChkOrderByItemCdAsc("T"); + } } diff --git a/src/main/resources/static/js/codeMgt/codeMgt.js b/src/main/resources/static/js/codeMgt/codeMgt.js index 634971be..78cbd24f 100644 --- a/src/main/resources/static/js/codeMgt/codeMgt.js +++ b/src/main/resources/static/js/codeMgt/codeMgt.js @@ -32,12 +32,13 @@ $(document).on('click', '#itemAddBtn', function (){ $('#itemTable').find('tbody').append( '' + ''+ - ''+ + ''+ ''+ ''+ '' ) - codeCategoryList[selectedCategoryIdx].itemList.push({categoryCd:codeCategoryList[selectedCategoryIdx].categoryCd, itemCd:"", itemValue: "", useChk: "", status:"new"}) + codeCategoryList[selectedCategoryIdx].itemList + .push({categoryCd:codeCategoryList[selectedCategoryIdx].categoryCd, itemCd:codeCategoryList[selectedCategoryIdx].categoryCd, itemValue: "", useChk: "T", status:"new"}) }) $(document).on('click', '.rowDeleteBtn', function (){ @@ -149,7 +150,7 @@ function makeItemTr(itemList){ ''+(item.status==="new"?'':'')+''+ ''+ ''+ - ''+ + ''+(item.status==="new"?'':'')+''+ '' ) });