From c351f4063a8ae6909778b9968298facb727ddf58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Tue, 17 Oct 2023 10:36:45 +0900
Subject: [PATCH] =?UTF-8?q?=ED=86=B5=EC=97=AD=EC=9D=B8=20=ED=98=84?=
 =?UTF-8?q?=ED=99=A9=20=EB=AA=A9=EB=A1=9D=20=EB=85=B8=EC=B6=9C=20=EC=A1=B0?=
 =?UTF-8?q?=EA=B1=B4=20=EC=88=98=EC=A0=95.(=EA=B0=9C=EC=9D=B8=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=EB=8F=99=EC=9D=98=20=EC=97=AC=EB=B6=80)=20=EC=99=B8?=
 =?UTF-8?q?=EC=82=AC=EA=B2=BD=EC=B0=B0=ED=98=84=ED=99=A9=20=E7=8F=BE->?=
 =?UTF-8?q?=E9=9D=9E=20=EC=A0=84=EC=B6=9C=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/translator/TranslatorController.java  |  7 +++++--
 .../mybatisMapper/TranslatorMapper.xml         | 18 +++++++++++++-----
 src/main/resources/static/js/police/police.js  |  6 ++++--
 .../templates/police/police/policeList.html    |  3 ++-
 4 files changed, 24 insertions(+), 10 deletions(-)

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 77651c14..0889a9de 100644
--- a/src/main/java/com/dbnt/faisp/main/translator/TranslatorController.java
+++ b/src/main/java/com/dbnt/faisp/main/translator/TranslatorController.java
@@ -40,7 +40,6 @@ public class TranslatorController {
                                      Translator translator,
                                      HttpServletResponse response) {
     ModelAndView mav = new ModelAndView("translator/translator");
-    translator.setDownOrganCdList(loginUser.getDownOrganCdList());
     //엑셀다운
     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"};
@@ -59,7 +58,11 @@ public class TranslatorController {
     }
     //메뉴권한 확인
     String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/translator/info").get(0).getAccessAuth();
-    
+
+    translator.setDownOrganCdList(loginUser.getDownOrganCdList());
+    translator.setWrtOrgan(loginUser.getOgCd());
+    translator.setAccessAuth(accessAuth);
+
     mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
     mav.addObject("userOrgan", loginUser.getOgCd());
     mav.addObject("accessAuth", accessAuth);
diff --git a/src/main/resources/mybatisMapper/TranslatorMapper.xml b/src/main/resources/mybatisMapper/TranslatorMapper.xml
index c9ce4d85..b09f6cdc 100644
--- a/src/main/resources/mybatisMapper/TranslatorMapper.xml
+++ b/src/main/resources/mybatisMapper/TranslatorMapper.xml
@@ -6,11 +6,7 @@
 <mapper namespace="com.dbnt.faisp.main.translator.mapper.TranslatorMapper">
   <sql id="selectTranslatorListWhere">
     <where>
-      ogdp1 in
-      <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
-        #{item}
-      </foreach>
-      and status &lt;> 'DST008'
+      status &lt;> 'DST008'
       <if test='trLang != null and trLang != ""'>
         and tr_lang = #{trLang}
       </if>
@@ -35,6 +31,18 @@
       <if test='dmlYn != null and dmlYn != ""'>
         and dml_yn = #{dmlYn}
       </if>
+      <if test='accessAuth == "ACC003"'>
+        and ogdp1 in <foreach collection="downOrganCdList" item="item" separator="," open="(" close=")">#{item}</foreach>
+      </if>
+      <if test='accessAuth != "ACC003"'>
+        and (
+            info_share_chk = 'T'
+            and ogdp1 in <foreach collection="downOrganCdList" item="item" separator="," open="(" close=")">#{item}</foreach>
+          ) or (
+            (info_share_chk &lt;> 'T' or info_share_chk is null)
+            and ogdp1 = #{wrtOrgan}
+          )
+      </if>
     </where>
   </sql>
   <select id="selectTranslatorList" resultType="Translator" parameterType="Translator">
diff --git a/src/main/resources/static/js/police/police.js b/src/main/resources/static/js/police/police.js
index 9fa141f1..a8522a96 100644
--- a/src/main/resources/static/js/police/police.js
+++ b/src/main/resources/static/js/police/police.js
@@ -146,19 +146,21 @@ $(document).on('click', '#notPoliceTab', function (){
   location.href = "/police/policeList?userStatus="+userStatus;
 })
 
-$(document).on('click', '#outBtn', function (){
+$(document).on('click', '.outBtn', function (){
   if($('input:checkbox[name=policeChk]:checked').length < 1){
     alert("전출대상을 선택해주세요")
     return false;
   }
+  const userStatus = $(this).attr('data-usccode');
   if(confirm("선택한 대상을 전출처리 하시겠습니까?")){
     const checkArr = [];
     $('input:checkbox[name=policeChk]:checked').each(function (idx, el){
       checkArr.push({});
       const target = $(el);
       checkArr[idx].userSeq = Number(target.parents('tr').find('.userSeq').val());
-      checkArr[idx].userStatus = "USC006"
+      checkArr[idx].userStatus = userStatus;
     })
+
     $.ajax({
       type : 'POST',
       url : "/police/policeStatusUpdate",
diff --git a/src/main/resources/templates/police/police/policeList.html b/src/main/resources/templates/police/police/policeList.html
index 1839da81..7a489152 100644
--- a/src/main/resources/templates/police/police/policeList.html
+++ b/src/main/resources/templates/police/police/policeList.html
@@ -183,7 +183,8 @@
                     </nav>
                   </div>
                   <div class="col-auto">
-                    <button type="button" class="btn btn-success" id="outBtn" th:if="${userStatus eq 'USC003'} and ${accessAuth eq 'ACC003'}">전출</button>
+                    <button type="button" class="btn btn-success outBtn" data-usccode="USC006" th:if="${userStatus eq 'USC003'} and ${accessAuth eq 'ACC003'}">전출(前)</button>
+                    <button type="button" class="btn btn-success outBtn" data-usccode="USC007" th:if="${userStatus eq 'USC003'} and ${accessAuth eq 'ACC003'}">전출(非)</button>
                     <button type="button" class="btn btn-success" id="inBtn" th:if="${accessAuth eq 'ACC003'} and (${userStatus eq 'USC006'} or ${userStatus eq 'USC007'})">전입</button>
                   </div>
                 </div>