From a5f2b90a29d718e9256b1f2e374d4b302ef660c5 Mon Sep 17 00:00:00 2001
From: TaehunPark <qkrxogns21@gmail.com>
Date: Wed, 5 Oct 2022 15:10:41 +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=EB=93=B1=EB=A1=9D=20=EA=B4=80=EC=84=9C=EC=84=A0?=
 =?UTF-8?q?=ED=83=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dbnt/faisp/translator/TranslatorController.java  | 1 +
 src/main/resources/mybatisMapper/TranslatorMapper.xml         | 4 ++--
 src/main/resources/static/js/translator/translator.js         | 2 ++
 src/main/resources/templates/translator/translator.html       | 4 ++--
 .../resources/templates/translator/translatorEditModal.html   | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/translator/TranslatorController.java b/src/main/java/com/dbnt/faisp/translator/TranslatorController.java
index db1b2e4f..468b4b0c 100644
--- a/src/main/java/com/dbnt/faisp/translator/TranslatorController.java
+++ b/src/main/java/com/dbnt/faisp/translator/TranslatorController.java
@@ -53,6 +53,7 @@ public class TranslatorController {
     String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/translator/info").get(0).getAccessAuth();
     
     mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
+    mav.addObject("userOrgan", loginUser.getOgCd());
     mav.addObject("accessAuth", accessAuth);
     translator.setQueryInfo();
     mav.addObject("translatorList", translatorSevice.selectTranslatorList(translator));
diff --git a/src/main/resources/mybatisMapper/TranslatorMapper.xml b/src/main/resources/mybatisMapper/TranslatorMapper.xml
index 8766c208..27cc1e3a 100644
--- a/src/main/resources/mybatisMapper/TranslatorMapper.xml
+++ b/src/main/resources/mybatisMapper/TranslatorMapper.xml
@@ -32,7 +32,7 @@
 		left outer join code_mgt f on a.tr_nny = f.item_cd 
 		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 
-	where wrt_organ in 
+	where ogdp1 in 
      <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
         #{item}
      </foreach>
@@ -90,7 +90,7 @@
 		left outer join code_mgt f on a.tr_nny = f.item_cd 
 		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
-	where wrt_organ in
+	where ogdp1 in
 	   <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
         #{item}
      </foreach>
diff --git a/src/main/resources/static/js/translator/translator.js b/src/main/resources/static/js/translator/translator.js
index 9c61f6f7..1d5744c3 100644
--- a/src/main/resources/static/js/translator/translator.js
+++ b/src/main/resources/static/js/translator/translator.js
@@ -58,6 +58,7 @@ $(document).on('click', '#updateBtn', function (){
 	}
 	
     if(confirm("수정하시겠습니까?")){
+	  document.getElementById("eOgdp1").disabled = false;
 	  const url = '/translator/translatorEditModal';
       contentFade("in");
       const formData = new FormData($("#trInfoUpdate")[0]);
@@ -106,6 +107,7 @@ $(document).on('click', '#saveBtn', function (){
 	}
 	
     if(confirm("저장하시겠습니까?")){
+	  document.getElementById("ogdp1").disabled = false;
       contentFade("in");
       const formData = new FormData($("#translatorInsert")[0]);
       $.ajax({
diff --git a/src/main/resources/templates/translator/translator.html b/src/main/resources/templates/translator/translator.html
index 3c86e5a6..d42028cc 100644
--- a/src/main/resources/templates/translator/translator.html
+++ b/src/main/resources/templates/translator/translator.html
@@ -194,11 +194,11 @@
           <div class="mb-3 row">
             <label for="ogCd" class="col-sm-2 col-form-label text-center">관서</label>
             <div class="col-sm-2">
-               <select class="form-select form-select-sm" id="ogdp1" name="ogdp1">
+               <select class="form-select form-select-sm" id="ogdp1" name="ogdp1" th:disabled="${accessAuth ne 'ACC003'}">
                   <option value="">선택</option>
                   <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                     <th:block th:if="${#lists.contains(mgtOrganList, commonCode.itemCd)}">
-                      <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"></option>
+                      <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq userOrgan}"></option>
                     </th:block>
                   </th:block>
                 </select>
diff --git a/src/main/resources/templates/translator/translatorEditModal.html b/src/main/resources/templates/translator/translatorEditModal.html
index 55680a10..85dfdd10 100644
--- a/src/main/resources/templates/translator/translatorEditModal.html
+++ b/src/main/resources/templates/translator/translatorEditModal.html
@@ -11,7 +11,7 @@
           <div class="mb-3 row">
             <label for="ogCd" class="col-sm-2 col-form-label text-center">관서</label>        
             <div class="col-sm-2">
-               <select class="form-select form-select-sm" id="eOgdp1" name="ogdp1">
+               <select class="form-select form-select-sm" id="eOgdp1" name="ogdp1" th:disabled="${accessAuth ne 'ACC003'}">
                   <option value="">선택</option>
                   <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                     <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd} == ${trInfo.ogdp1}"></option>