diff --git a/src/main/resources/mybatisMapper/TranslatorMapper.xml b/src/main/resources/mybatisMapper/TranslatorMapper.xml index b6a2ec37..bbbababa 100644 --- a/src/main/resources/mybatisMapper/TranslatorMapper.xml +++ b/src/main/resources/mybatisMapper/TranslatorMapper.xml @@ -11,7 +11,8 @@ and tr_lang = #{trLang} - and ogdp1 = #{ogdp1} + and (ogdp1 = #{ogdp1} + or ogdp1 in (select organ_cd from organ_config where parent_organ = #{ogdp1})) and tr_name = #{trName} @@ -74,7 +75,7 @@ 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 - order by translator_key desc + order by ogdp1, translator_key desc limit #{rowCnt} offset #{firstIndex} diff --git a/src/main/resources/templates/adminPage/userMgt/userEditModal.html b/src/main/resources/templates/adminPage/userMgt/userEditModal.html index 4f1d4079..f64a1731 100644 --- a/src/main/resources/templates/adminPage/userMgt/userEditModal.html +++ b/src/main/resources/templates/adminPage/userMgt/userEditModal.html @@ -102,7 +102,7 @@
- diff --git a/src/main/resources/templates/adminPage/userMgt/userMgt.html b/src/main/resources/templates/adminPage/userMgt/userMgt.html index 28ccd39e..209926b2 100644 --- a/src/main/resources/templates/adminPage/userMgt/userMgt.html +++ b/src/main/resources/templates/adminPage/userMgt/userMgt.html @@ -48,7 +48,7 @@
-
+