From 43df1469eac2d7dcc879228b1c7a3c7b182d5cad Mon Sep 17 00:00:00 2001
From: "DESKTOP-8U2ATRG\\lcks0" <cks0504_p@daum.net>
Date: Sun, 19 Feb 2023 20:26:51 +0900
Subject: [PATCH] =?UTF-8?q?230215=20=EC=9A=94=EC=B2=AD=EB=82=B4=EC=9A=A9?=
 =?UTF-8?q?=20=20-=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=EC=8B=9C=20?=
 =?UTF-8?q?=EC=99=B8=EA=B5=AD=EC=96=B4=20=ED=95=AD=EB=AA=A9=20=EC=84=A0?=
 =?UTF-8?q?=ED=83=9D=20=EC=98=B5=EC=85=98=EC=9D=84=20=ED=95=B4=EB=8B=B9?=
 =?UTF-8?q?=EC=97=86=EC=9D=8C=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

230216 요청내용
 - 신병처리 선택항목 기타를 기타(신병인계)로 텍스트 수정
 - 검색 조건에서 지방청 목록에 본청 추가. 경찰서 목록에 서특단 추가.
 - 마감기능 본청 관리자만 변경 가능하도록 수정.
---
 .../InternationalCrimeArrestController.java                   | 1 +
 src/main/resources/static/js/common.js                        | 2 +-
 .../internationalCrimeArrest/internationalCrimeArrest.html    | 4 ++--
 .../internationalCrimeArrestEditModal.html                    | 2 +-
 src/main/resources/templates/login/joinForm.html              | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java
index 8eefdfb0..2bd8e057 100644
--- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java
+++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java
@@ -42,6 +42,7 @@ public class InternationalCrimeArrestController {
     String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/internationalCrimeArrest").get(0).getAccessAuth();
 
     mav.addObject("accessAuth", accessAuth);
+    mav.addObject("userOrgan", loginUser.getOgCd());
     mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
 
     internationalCrimeArrest.setQueryInfo();
diff --git a/src/main/resources/static/js/common.js b/src/main/resources/static/js/common.js
index ea56e558..a6166e1f 100644
--- a/src/main/resources/static/js/common.js
+++ b/src/main/resources/static/js/common.js
@@ -255,7 +255,7 @@ function departmentDynamicOption(targetTagName, code, defaultOptionName='') {
   $(targetTagName).empty();
   let option = '';
   organConfigList.forEach(function (organConfig) {
-    if(!(organConfig.organCd === "OG027" || organConfig.organCd === "OG028")){
+    if(organConfig.organCd !== "OG028"){
       if (organConfig.parentOrgan != null && organConfig.organType !== 'OGC002' && organConfig.parentOrgan === code) {
         option += '<option value="' + organConfig.organCd + '">' + organConfig.organNm + '</option>';
       }
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html
index 8cb334cb..2f345bd3 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html
@@ -49,7 +49,7 @@
                         <select class="form-select form-select-sm" name="organ">
                           <option value="">지방청 선택</option>
                           <th:block th:each="organConfig:${organConfigList}">
-                            <th:block th:if="${organConfig.parentOrgan eq 'OG001' && organConfig.organType ne 'OGC001'}">
+                            <th:block th:if="${organConfig.parentOrgan eq 'OG001' or organConfig.organCd eq 'OG001'}">
                               <option th:value="${organConfig.organCd}" th:text="${organConfig.organNm}" th:selected="${organConfig.organCd eq searchParams.organ}"></option>
                             </th:block>
                           </th:block>
@@ -222,7 +222,7 @@
               <!-- 페이징 -->
               <div class="row justify-content-between">
                 <div class="col-auto">
-                  <button class="btn btn-warning" id="deadlineBtn" data-menukey="41" th:data-deadlinechk="${deadlineState}" th:if="${accessAuth eq 'ACC003'}" th:text="${deadlineState eq 'F'?'마감':'등록허용'}"></button>
+                  <button class="btn btn-warning" id="deadlineBtn" data-menukey="41" th:data-deadlinechk="${deadlineState}" th:if="${userOrgan eq 'OG001' and accessAuth eq 'ACC003'}" th:text="${deadlineState eq 'F'?'마감':'등록허용'}"></button>
                   <button class="btn btn-success" id="icaExcelDownBtn">엑셀 다운로드</button>
                 </div>
                 <div class="col-auto">
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html
index eb8981bb..32786db1 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html
@@ -317,7 +317,7 @@
             <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
                     th:selected="${commonCode.itemCd eq internationalCrimeArrest.processResult}"></option>
           </th:block>
-          <option value="etc" th:selected="${internationalCrimeArrest.processResult ne null && internationalCrimeArrest.processResult ne '' && !#strings.contains(internationalCrimeArrest.processResult, 'PCR')}">기타</option>
+          <option value="etc" th:selected="${internationalCrimeArrest.processResult ne null && internationalCrimeArrest.processResult ne '' && !#strings.contains(internationalCrimeArrest.processResult, 'PCR')}">기타(신병인계)</option>
         </select>
       </div>
     </div>
diff --git a/src/main/resources/templates/login/joinForm.html b/src/main/resources/templates/login/joinForm.html
index aba353ea..dfae0ed9 100644
--- a/src/main/resources/templates/login/joinForm.html
+++ b/src/main/resources/templates/login/joinForm.html
@@ -160,7 +160,7 @@
         <label for="languageCd" class="col-sm-2 col-form-label col-form-label-sm text-center">외국어특채</label>
         <div class="col-sm-4">
           <select class="form-select form-select-sm" id="languageCd" name="languageCd">
-            <option value="">--선택--</option>
+            <option value="">해당없음</option>
             <th:block th:each="code:${languageList}">
               <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.groupCd}"></option>
             </th:block>