해더 알람 갯수표시 양식변경

국제범죄검거 권한별 등록, 수정 기능 확인.

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;
   }
 

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>';
       }
     }
   });

src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html

@@ -251,7 +251,9 @@
                   </nav>
                 </div>
                 <div class="col-auto">
+                  <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>

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>-->

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">