From 41617b234dddb8b5969c0c305070de7715cb8da1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EA=B0=95=EC=84=9D?= <cks0504_p@daum.net>
Date: Thu, 29 Feb 2024 11:50:58 +0900
Subject: [PATCH] =?UTF-8?q?=ED=86=B5=EC=97=AD=EC=9D=B8=20=EA=B2=80?=
 =?UTF-8?q?=EC=83=89=20=EB=AD=90=EB=A6=AC=20=EC=88=98=EC=A0=95.=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EB=B6=80=EC=84=9C=20=ED=8E=B8?=
 =?UTF-8?q?=EC=A7=91=20=ED=97=88=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mybatisMapper/TranslatorMapper.xml        | 5 +++--
 .../resources/templates/adminPage/userMgt/userEditModal.html | 2 +-
 src/main/resources/templates/adminPage/userMgt/userMgt.html  | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

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}
       </if>
       <if test='ogdp1 != null and ogdp1 != ""'>
-        and ogdp1 = #{ogdp1}
+        and (ogdp1 = #{ogdp1}
+            or ogdp1 in (select organ_cd from organ_config where parent_organ  = #{ogdp1}))
       </if>
       <if test='trName != null and trName != ""'>
         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
     <include refid="selectTranslatorListWhere"></include>
-    order by translator_key desc
+    order by ogdp1, translator_key desc
     limit #{rowCnt} offset #{firstIndex}
   </select>
 
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 @@
     <div class="row mb-1">
       <label for="ofcCd" class="col-sm-2 col-form-label col-form-label-sm text-center">부서</label>
       <div class="col-sm-2">
-        <select class="form-select form-select-sm" id="ofcCd" name="ofcCd" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
+        <select class="form-select form-select-sm" id="ofcCd" name="ofcCd"><!-- th:disabled="${!#strings.isEmpty(userInfo.dicCode)}"-->
           <option value="">--선택--</option>
           <th:block th:each="code:${session.commonCode.get(userInfo.ogCd)}">
             <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${userInfo.ofcCd eq code.itemCd}"></option>
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 @@
                         </th:block>
                       </select>
                     </div>
-                    <div class="col-auto">
+                    <!--<div class="col-auto">
                       <select class="form-select form-select-sm" name="ofcCd" id="ofcCdSearch">
                         <option value="">부서 선택</option>
                         <th:block th:each="parentCode:${session.commonCode.get('OG')}">
@@ -58,7 +58,7 @@
                           </th:block>
                         </th:block>
                       </select>
-                    </div>
+                    </div>-->
                     <div class="col-auto">
                       <select class="form-select form-select-sm" name="titleCd">
                         <option value="">계급 선택</option>