From e4befe8898f164710d1eaf9bcdfb8f962ea76556 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, 14 Mar 2023 12:02:26 +0900
Subject: [PATCH] =?UTF-8?q?=ED=95=B4=EB=8D=94=20=EC=95=8C=EB=9E=8C=20?=
 =?UTF-8?q?=EA=B0=AF=EC=88=98=ED=91=9C=EC=8B=9C=20=EC=96=91=EC=8B=9D?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EA=B5=AD=EC=A0=9C=EB=B2=94=EC=A3=84?=
 =?UTF-8?q?=EA=B2=80=EA=B1=B0=20=EA=B6=8C=ED=95=9C=EB=B3=84=20=EB=93=B1?=
 =?UTF-8?q?=EB=A1=9D,=20=EC=88=98=EC=A0=95=20=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=ED=99=95=EC=9D=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InternationalCrimeArrestController.java                   | 2 ++
 src/main/resources/static/js/common.js                        | 2 ++
 .../internationalCrimeArrest/internationalCrimeArrest.html    | 4 +++-
 .../internationalCrimeArrestViewModal.html                    | 2 +-
 src/main/resources/templates/fragments/header.html            | 2 +-
 5 files changed, 9 insertions(+), 3 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 2bd8e057..46d7ec99 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
@@ -86,6 +86,8 @@ public class InternationalCrimeArrestController {
     mav.addObject("organConfigList", organConfigService.selectOrganList());
     //메뉴권한 확인
     mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/internationalCrimeArrest").get(0).getAccessAuth());
+    mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
+
     return mav;
   }
 
diff --git a/src/main/resources/static/js/common.js b/src/main/resources/static/js/common.js
index 9115eb5a..ec90043f 100644
--- a/src/main/resources/static/js/common.js
+++ b/src/main/resources/static/js/common.js
@@ -267,6 +267,8 @@ function departmentDynamicOption(targetTagName, code, defaultOptionName='') {
     if(organConfig.organCd !== "OG028"){
       if (organConfig.parentOrgan != null && organConfig.organType !== 'OGC002' && organConfig.parentOrgan === code) {
         option += '<option value="' + organConfig.organCd + '">' + organConfig.organNm + '</option>';
+      }else if(code==="OG001" && organConfig.organType === 'OGC003'){
+        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 2f345bd3..a4b7f29c 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html
@@ -251,7 +251,9 @@
                   </nav>
                 </div>
                 <div class="col-auto">
-                  <button class="btn btn-primary" id="icaAddBtn" th:disabled="${deadlineState eq 'T'}">등록</button>
+                  <th:block th:if="${accessAuth ne 'ACC001'}">
+                    <button class="btn btn-primary" id="icaAddBtn" th:disabled="${deadlineState eq 'T'}">등록</button>
+                  </th:block>
                 </div>
               </div>
             </div>
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html
index 3938f487..fac5704b 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html
@@ -313,7 +313,7 @@
   </div>
 </div>
 <div class="modal-footer bg-light">
-  <th:block th:if="${userSeq eq internationalCrimeArrest.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
+  <th:block th:if="${userSeq eq internationalCrimeArrest.wrtUserSeq or (#lists.contains(mgtOrganList, internationalCrimeArrest.wrtOrgan) and accessAuth eq 'ACC003')}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
     <button type="button" class="btn btn-warning" id="icaEditBtn">수정</button>
   </th:block>
 <!--  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html
index ae904e4c..81066fb1 100644
--- a/src/main/resources/templates/fragments/header.html
+++ b/src/main/resources/templates/fragments/header.html
@@ -53,7 +53,7 @@
         <a href="#" class="nav-link" th:id="${#lists.isEmpty(alarmList)?'':'bellIcon'}" th:classappend="${#lists.isEmpty(alarmList)?'link-dark':'link-danger'}">
           <th:block th:if="${!#lists.isEmpty(alarmList)}">
             <div class="position-relative">
-              <div id="alarmCntDiv" class="position-absolute text-center rounded-circle bg-danger text-light fs-11" th:text="${alarmListCnt}"></div>
+              <div id="alarmCntDiv" class="position-absolute text-center rounded-circle bg-danger text-light fs-11" th:text="${alarmListCnt>10?'9+':alarmListCnt}"></div>
               <div id="alarmListDiv" class="position-absolute bg-white card d-none">
                 <div class="card-body">
                   <table class="table table-sm table-bordered table-hover">