From 04d9e4695d0d9fcf98f7153c57c60a611c858c5b Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Tue, 27 Sep 2022 13:43:38 +0900 Subject: [PATCH] =?UTF-8?q?fix:=EB=AF=BC=EA=B0=84=ED=86=B5=EC=97=AD?= =?UTF-8?q?=EC=9D=B8=20=EC=88=98=EC=A0=95=EA=B6=8C=ED=95=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dbnt/faisp/translator/TranslatorController.java | 4 ++++ .../dbnt/faisp/translator/mapper/TranslatorMapper.java | 3 ++- .../dbnt/faisp/translator/service/TranslatorService.java | 4 ++++ src/main/resources/mybatisMapper/TranslatorMapper.xml | 8 ++++++++ src/main/resources/templates/translator/translator.html | 8 ++------ .../templates/translator/translatorCareerModal.html | 6 +++--- .../templates/translator/translatorEditModal.html | 2 +- 7 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/translator/TranslatorController.java b/src/main/java/com/dbnt/faisp/translator/TranslatorController.java index 6c660793..db1b2e4f 100644 --- a/src/main/java/com/dbnt/faisp/translator/TranslatorController.java +++ b/src/main/java/com/dbnt/faisp/translator/TranslatorController.java @@ -74,6 +74,8 @@ public class TranslatorController { ModelAndView mav = new ModelAndView("translator/translatorEditModal"); //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/translator/info").get(0).getAccessAuth(); + mav.addObject("wrtId", translatorSevice.selectTrFristId(translator.getTranslatorKey())); + mav.addObject("userId", loginUser.getUserId()); mav.addObject("trInfo", translatorSevice.selectTranslatorView(translator)); mav.addObject("accessAuth", accessAuth); return mav; @@ -109,6 +111,8 @@ public class TranslatorController { mav.addObject("policeCrr", translatorSevice.selectMaritimePoliceCareer(translatorCrr)); mav.addObject("anotherCrr", translatorSevice.selectAnotherOrganizationCareer(translatorCrr)); mav.addObject("trKey", translatorCrr.getTranslatorKey()); + mav.addObject("wrtId", translatorSevice.selectTrFristId(translatorCrr.getTranslatorKey())); + mav.addObject("userId", loginUser.getUserId()); mav.addObject("accessAuth", accessAuth); return mav; } diff --git a/src/main/java/com/dbnt/faisp/translator/mapper/TranslatorMapper.java b/src/main/java/com/dbnt/faisp/translator/mapper/TranslatorMapper.java index 6ae4bffa..3856fb81 100644 --- a/src/main/java/com/dbnt/faisp/translator/mapper/TranslatorMapper.java +++ b/src/main/java/com/dbnt/faisp/translator/mapper/TranslatorMapper.java @@ -2,7 +2,6 @@ package com.dbnt.faisp.translator.mapper; import com.dbnt.faisp.translator.model.Translator; import com.dbnt.faisp.translator.model.TranslatorCrr; -import com.dbnt.faisp.userInfo.model.UserInfo; import com.dbnt.faisp.util.ParamMap; import org.apache.ibatis.annotations.Mapper; @@ -28,4 +27,6 @@ public interface TranslatorMapper { List selectTranslatorListEx(Translator translator); + String selectTrFristId(int translatorKey); + } diff --git a/src/main/java/com/dbnt/faisp/translator/service/TranslatorService.java b/src/main/java/com/dbnt/faisp/translator/service/TranslatorService.java index 45bcbff1..427e0393 100644 --- a/src/main/java/com/dbnt/faisp/translator/service/TranslatorService.java +++ b/src/main/java/com/dbnt/faisp/translator/service/TranslatorService.java @@ -140,4 +140,8 @@ public class TranslatorService { return translatorMapper.selectTranslatorListEx(translator); } + public String selectTrFristId(int translatorKey) { + return translatorMapper.selectTrFristId(translatorKey); + } + } diff --git a/src/main/resources/mybatisMapper/TranslatorMapper.xml b/src/main/resources/mybatisMapper/TranslatorMapper.xml index cf46fc4d..8766c208 100644 --- a/src/main/resources/mybatisMapper/TranslatorMapper.xml +++ b/src/main/resources/mybatisMapper/TranslatorMapper.xml @@ -312,5 +312,13 @@ order by translator_key desc + + \ No newline at end of file diff --git a/src/main/resources/templates/translator/translator.html b/src/main/resources/templates/translator/translator.html index f7bd937f..3c86e5a6 100644 --- a/src/main/resources/templates/translator/translator.html +++ b/src/main/resources/templates/translator/translator.html @@ -133,12 +133,8 @@ - - ● - - - - + ● + diff --git a/src/main/resources/templates/translator/translatorCareerModal.html b/src/main/resources/templates/translator/translatorCareerModal.html index ccab8ffc..07b80bec 100644 --- a/src/main/resources/templates/translator/translatorCareerModal.html +++ b/src/main/resources/templates/translator/translatorCareerModal.html @@ -29,7 +29,7 @@ ㅇ - + @@ -52,7 +52,7 @@ - + @@ -61,7 +61,7 @@
- +
diff --git a/src/main/resources/templates/translator/translatorEditModal.html b/src/main/resources/templates/translator/translatorEditModal.html index 9fdb84d5..5fe6520c 100644 --- a/src/main/resources/templates/translator/translatorEditModal.html +++ b/src/main/resources/templates/translator/translatorEditModal.html @@ -113,7 +113,7 @@
- +