diff --git a/src/main/java/com/dbnt/faisp/main/translator/TranslatorController.java b/src/main/java/com/dbnt/faisp/main/translator/TranslatorController.java index 77651c14..0889a9de 100644 --- a/src/main/java/com/dbnt/faisp/main/translator/TranslatorController.java +++ b/src/main/java/com/dbnt/faisp/main/translator/TranslatorController.java @@ -40,7 +40,6 @@ public class TranslatorController { Translator translator, HttpServletResponse response) { ModelAndView mav = new ModelAndView("translator/translator"); - translator.setDownOrganCdList(loginUser.getDownOrganCdList()); //엑셀다운 if(translator.getExcel() != null && translator.getExcel().equals("Y")){ String[] headers = { "translator_key", "ogdp1", "tr_lang", "tr_career", "tr_name", "tr_age", "tr_nny", "tr_edu", "tr_cft", "dml_yn", "apt_dt", "tr_phone"}; @@ -59,7 +58,11 @@ public class TranslatorController { } //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/translator/info").get(0).getAccessAuth(); - + + translator.setDownOrganCdList(loginUser.getDownOrganCdList()); + translator.setWrtOrgan(loginUser.getOgCd()); + translator.setAccessAuth(accessAuth); + mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); mav.addObject("userOrgan", loginUser.getOgCd()); mav.addObject("accessAuth", accessAuth); diff --git a/src/main/resources/mybatisMapper/TranslatorMapper.xml b/src/main/resources/mybatisMapper/TranslatorMapper.xml index c9ce4d85..b09f6cdc 100644 --- a/src/main/resources/mybatisMapper/TranslatorMapper.xml +++ b/src/main/resources/mybatisMapper/TranslatorMapper.xml @@ -6,11 +6,7 @@ - ogdp1 in - - #{item} - - and status <> 'DST008' + status <> 'DST008' and tr_lang = #{trLang} @@ -35,6 +31,18 @@ and dml_yn = #{dmlYn} + + and ogdp1 in #{item} + + + and ( + info_share_chk = 'T' + and ogdp1 in #{item} + ) or ( + (info_share_chk <> 'T' or info_share_chk is null) + and ogdp1 = #{wrtOrgan} + ) +