From c070750a46cfc6c3cc6e1c08cd53357a3d7097ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Tue, 31 Oct 2023 18:12:16 +0900 Subject: [PATCH] =?UTF-8?q?=ED=86=B5=EC=97=AD=EC=9D=B8=ED=98=84=ED=99=A9?= =?UTF-8?q?=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/translator/TranslatorController.java | 15 ++++++++------- .../resources/mybatisMapper/TranslatorMapper.xml | 5 ++++- 2 files changed, 12 insertions(+), 8 deletions(-) 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 0889a9de..46ca5c15 100644 --- a/src/main/java/com/dbnt/faisp/main/translator/TranslatorController.java +++ b/src/main/java/com/dbnt/faisp/main/translator/TranslatorController.java @@ -39,7 +39,13 @@ public class TranslatorController { public ModelAndView translatorInfo(@AuthenticationPrincipal UserInfo loginUser, Translator translator, HttpServletResponse response) { - ModelAndView mav = new ModelAndView("translator/translator"); + + //메뉴권한 확인 + String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/translator/info").get(0).getAccessAuth(); + + translator.setDownOrganCdList(loginUser.getDownOrganCdList()); + translator.setWrtOrgan(loginUser.getOgCd()); + translator.setAccessAuth(accessAuth); //엑셀다운 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"}; @@ -56,13 +62,8 @@ public class TranslatorController { } return null; } - //메뉴권한 확인 - String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/translator/info").get(0).getAccessAuth(); - - translator.setDownOrganCdList(loginUser.getDownOrganCdList()); - translator.setWrtOrgan(loginUser.getOgCd()); - translator.setAccessAuth(accessAuth); + ModelAndView mav = new ModelAndView("translator/translator"); 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 07b67e43..b6a2ec37 100644 --- a/src/main/resources/mybatisMapper/TranslatorMapper.xml +++ b/src/main/resources/mybatisMapper/TranslatorMapper.xml @@ -203,6 +203,7 @@ on a.translator_key =b.translator_key and a.version_no = b.lastVer inner join organ_config c on a.ogdp1 = c.organ_cd where a.status <> 'DST008' + and a.dml_yn <>'O' ) d inner join code_mgt cm on d.lang=cm.item_cd group by cm.item_value @@ -251,7 +252,9 @@ group by translator_key) b on a.translator_key =b.translator_key and a.version_no = b.lastVer inner join organ_config c on a.ogdp1 = c.organ_cd - where a.status <> 'DST008') d + where a.status <> 'DST008' + and a.dml_yn <> 'O' + ) d inner join code_mgt cm on d.lang=cm.item_cd group by cm.item_value ) a