diff --git a/src/main/java/com/dbnt/faisp/translator/TranslatorController.java b/src/main/java/com/dbnt/faisp/translator/TranslatorController.java index db1b2e4f..468b4b0c 100644 --- a/src/main/java/com/dbnt/faisp/translator/TranslatorController.java +++ b/src/main/java/com/dbnt/faisp/translator/TranslatorController.java @@ -53,6 +53,7 @@ public class TranslatorController { String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/translator/info").get(0).getAccessAuth(); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); + mav.addObject("userOrgan", loginUser.getOgCd()); mav.addObject("accessAuth", accessAuth); translator.setQueryInfo(); mav.addObject("translatorList", translatorSevice.selectTranslatorList(translator)); diff --git a/src/main/resources/mybatisMapper/TranslatorMapper.xml b/src/main/resources/mybatisMapper/TranslatorMapper.xml index 8766c208..27cc1e3a 100644 --- a/src/main/resources/mybatisMapper/TranslatorMapper.xml +++ b/src/main/resources/mybatisMapper/TranslatorMapper.xml @@ -32,7 +32,7 @@ left outer join code_mgt f on a.tr_nny = f.item_cd left outer join code_mgt g on a.tr_edu = g.item_cd left outer join code_mgt h on a.tr_visa = h.item_cd - where wrt_organ in + where ogdp1 in #{item} @@ -90,7 +90,7 @@ left outer join code_mgt f on a.tr_nny = f.item_cd left outer join code_mgt g on a.tr_edu = g.item_cd left outer join code_mgt h on a.tr_visa = h.item_cd - where wrt_organ in + where ogdp1 in #{item} diff --git a/src/main/resources/static/js/translator/translator.js b/src/main/resources/static/js/translator/translator.js index 9c61f6f7..1d5744c3 100644 --- a/src/main/resources/static/js/translator/translator.js +++ b/src/main/resources/static/js/translator/translator.js @@ -58,6 +58,7 @@ $(document).on('click', '#updateBtn', function (){ } if(confirm("수정하시겠습니까?")){ + document.getElementById("eOgdp1").disabled = false; const url = '/translator/translatorEditModal'; contentFade("in"); const formData = new FormData($("#trInfoUpdate")[0]); @@ -106,6 +107,7 @@ $(document).on('click', '#saveBtn', function (){ } if(confirm("저장하시겠습니까?")){ + document.getElementById("ogdp1").disabled = false; contentFade("in"); const formData = new FormData($("#translatorInsert")[0]); $.ajax({ diff --git a/src/main/resources/templates/translator/translator.html b/src/main/resources/templates/translator/translator.html index 3c86e5a6..d42028cc 100644 --- a/src/main/resources/templates/translator/translator.html +++ b/src/main/resources/templates/translator/translator.html @@ -194,11 +194,11 @@
- - + diff --git a/src/main/resources/templates/translator/translatorEditModal.html b/src/main/resources/templates/translator/translatorEditModal.html index 55680a10..85dfdd10 100644 --- a/src/main/resources/templates/translator/translatorEditModal.html +++ b/src/main/resources/templates/translator/translatorEditModal.html @@ -11,7 +11,7 @@
-