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 46ca5c15..50fcb654 100644 --- a/src/main/java/com/dbnt/faisp/main/translator/TranslatorController.java +++ b/src/main/java/com/dbnt/faisp/main/translator/TranslatorController.java @@ -42,15 +42,37 @@ public class TranslatorController { //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/translator/info").get(0).getAccessAuth(); - + if(accessAuth.equals("ACC003") && loginUser.getOgCd().equals("OG001")){ + if(translator.getInfoShareChk()==null || translator.getInfoShareChk().isEmpty()){ + translator.setInfoShareChk("T"); + } + }else{ + translator.setInfoShareChk("T"); + } 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"}; - String[] headerNames = { "연번", "관서명", "언어", "경력", "성명", "나이", "국적", "학력", "자격증", "해촉", "위촉일", "연락처" }; - String[] columnType = { "String", "String", "String", "String", "String", "String", "String", "String", "String", "String", "String", "String"}; + String[] headers = { + "translator_key", "ogdp1", "tr_lang", + "tr_career", "tr_name", "tr_sex", + "tr_age", "tr_nny", "tr_edu", + "tr_visa", "info_share_chk", "edu_chk", + "dml_yn", "apt_dt", "tr_phone"}; + String[] headerNames = { + "연번", "관서명", "언어", + "경력", "성명", "성별", + "나이", "국적", "학력", + "비자", "개인정보 동의여부", "교육이수여부", + "해촉", "위촉일", "연락처" }; + String[] columnType = { + "String", "String", "String", + "String", "String", "String", + "String", "String", "String", + "String", "String", "String", + "String", "String", "String"}; String sheetName = "민간 통역인 현황"; String excelFileName = "민간 통역인 현황"; List translatorInfoList= translatorSevice.selectTranslatorListEx(translator); diff --git a/src/main/resources/mybatisMapper/TranslatorMapper.xml b/src/main/resources/mybatisMapper/TranslatorMapper.xml index bbbababa..197ea459 100644 --- a/src/main/resources/mybatisMapper/TranslatorMapper.xml +++ b/src/main/resources/mybatisMapper/TranslatorMapper.xml @@ -32,17 +32,17 @@ and dml_yn = #{dmlYn} - - and ogdp1 in #{item} - - - and ( - info_share_chk = 'T' - ) or ( - (info_share_chk <> 'T' or info_share_chk is null) - and ogdp1 = #{wrtOrgan} - ) - + + + and info_share_chk = 'T' + + + and (info_share_chk <> 'T' or info_share_chk is null) + + + and info_share_chk = 'T' + + @@ -205,6 +205,7 @@ inner join organ_config c on a.ogdp1 = c.organ_cd where a.status <> 'DST008' and a.dml_yn <>'O' + and info_share_chk = 'T' ) d inner join code_mgt cm on d.lang=cm.item_cd group by cm.item_value @@ -255,6 +256,7 @@ inner join organ_config c on a.ogdp1 = c.organ_cd where a.status <> 'DST008' and a.dml_yn <> 'O' + and info_share_chk = 'T' ) d inner join code_mgt cm on d.lang=cm.item_cd group by cm.item_value @@ -262,59 +264,46 @@ + + + + +