Merge branch 'master' of https://dev.azure.com/DBNTech/ForeignAffairs/_git/ForeignAffairs

# Conflicts:
#	src/main/resources/templates/login/joinForm.html
#	src/main/resources/templates/login/login.html

src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java

@@ -34,6 +34,7 @@ public class IvsgtController {
         mav.addObject("accessAuth", accessAuth);
         mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
         
+        boardInvestigation.setDownOrganCdList(loginUser.getDownOrganCdList());
         boardInvestigation.setQueryInfo();
         mav.addObject("boardInvestigationList", boardInvestigationService.selectBoardInvestigationList(boardInvestigation));
         boardInvestigation.setContentCnt(boardInvestigationService.selectBoardInvestigationListCnt(boardInvestigation));

src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java

@@ -40,9 +40,7 @@ public class MajorStatusController {
         mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
         mav.addObject("searchParams", majorStatus);
 
-        majorStatus.setDownOrganCdList(loginUser.getDownOrganCdList());
         majorStatus.setQueryInfo();
-
         mav.addObject("majorList", majorStatusService.selectMajorList(majorStatus));
         majorStatus.setContentCnt(majorStatusService.selectMajorListCnt(majorStatus));
         majorStatus.setPaginationInfo();

src/main/resources/mybatisMapper/BoardInvestigationMapper.xml

@@ -6,6 +6,10 @@
 <mapper namespace="com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.mapper.BoardInvestigationMapper">
     <sql id="selectBoardInvestigationListWhere">
     <where>
+        and a.wrt_organ in
+        <foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
+          #{organCd}
+        </foreach>
         <if test='ivsgtType != null and ivsgtType != ""'>
             AND ivsgt_type = #{ivsgtType}
         </if>

src/main/resources/mybatisMapper/MajorStatusMapper.xml

@@ -26,12 +26,6 @@
             <if test='endDate != null and endDate != ""'>
                 and a.wrt_dt &lt;= #{endDate}::date+1
             </if>
-
-            and a.wrt_organ in
-                   <foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
-                       #{organCd}
-                    </foreach>
-
         </where>
     </sql>
 

src/main/resources/static/js/login/login.js

@@ -8,7 +8,7 @@ $(document).on('click', '#dicCodeSearchBtn', function (){
   if(dicCode!==''){
     getJoinForm(dicCode);
   }else{
-   alert("공무원식별번호를 입력해주세요.")
+   alert("디지털식별코드를 입력해주세요.")
   }
 })
 

src/main/resources/static/js/police/police.js

@@ -30,7 +30,7 @@ function showModal(userSeq){
 $(document).on('click', '#syncToKwmsBtn', function (){
   const dicCode = $("#dicCode").val();
   if(!dicCode){
-    alert("공무원식별번호가 없습니다.")
+    alert("디지털식별코드가 없습니다.")
   }else{
     syncUserInfoToKwms([{
       userSeq: $("#userSeq").val(),

src/main/resources/static/js/userMgt/userMgt.js

@@ -58,7 +58,7 @@ $(document).on('click', '#deleteBtn', function (){
 $(document).on('click', '#syncToKwmsBtn', function (){
   const dicCode = $("#dicCode").val();
   if(!dicCode){
-    alert("공무원식별번호가 없습니다.")
+    alert("디지털식별코드가 없습니다.")
   }else{
     syncUserInfoToKwms([{
       userSeq: $("#userSeq").val(),

src/main/resources/templates/adminPage/userMgt/userEditModal.html

@@ -28,7 +28,7 @@
       </div>
     </div>
     <div class="mb-3 mt-3 row">
-      <label for="dicCode" class="col-sm-2 col-form-label col-form-label-sm text-center ">공무원식별번호</label>
+      <label for="dicCode" class="col-sm-2 col-form-label col-form-label-sm text-center ">디지털식별코드</label>
       <div class="col-sm-4">
         <input type="text" class="form-control form-control-sm" id="dicCode" name="dicCode" autocomplete="off" th:value="${userInfo.dicCode}">
       </div>
@@ -171,7 +171,7 @@
     <th:block th:if="${userInfo.userStatus eq 'USC003'}">
       <button type="button" class="btn btn-info" id="syncToKwmsBtn" th:disabled="${#strings.isEmpty(userInfo.dicCode)}">인사시스템 정보 불러오기</button>
       <th:block th:if="${#strings.isEmpty(userInfo.dicCode)}">
-        <label for="syncToKwmsBtn" style="font-size: 12px">공무원식별번호가 필요합니다.</label>
+        <label for="syncToKwmsBtn" style="font-size: 12px">디지털식별코드가 필요합니다.</label>
       </th:block>
     </th:block>
   </div>

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

@@ -14,7 +14,10 @@
     <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
     <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
     <div class="row justify-content-between">
-      <div class="col-auto"><h4>불법조업 외국어선 단속현황</h4></div>
+      <div class="col-auto">
+        <div class="d-inline align-middle"><i class="bi bi-square-fill"></i></div>
+        <h5 class="d-inline align-middle"> 불법조업 외국어선 단속현황</h5>
+      </div>
       <div class="col-auto"><p class="mb-0 mt-2">외사통계 > 불법조업외국어선 > 불법조업 외국어선 단속현황</p></div>
     </div>
     <div class="row mx-0">

src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html

@@ -19,7 +19,10 @@
 <div layout:fragment="content">
   <main>
     <div class="row justify-content-between">
-      <div class="col-auto"><h4>불법조업 외국어선 정보</h4></div>
+      <div class="col-auto">
+        <div class="d-inline align-middle"><i class="bi bi-square-fill"></i></div>
+        <h5 class="d-inline align-middle"> 불법조업 외국어선 정보</h5>
+      </div>
       <div class="col-auto"><p class="mb-0 mt-2">외사통계 > 불법조업외국어선 > 불법조업 외국어선 정보</p></div>
     </div>
     <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>

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

@@ -16,7 +16,10 @@
     <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
     <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
     <div class="row justify-content-between">
-      <div class="col-auto"><h4>국제범죄 검거현황</h4></div>
+      <div class="col-auto mb-2">
+        <div class="d-inline align-middle"><i class="bi bi-square-fill"></i></div>
+        <h5 class="d-inline align-middle"> 국제범죄 검거현황</h5>
+      </div>
       <div class="col-auto"><p class="mb-0 mt-2">외사통계 > 국제범죄검거현황</p></div>
     </div>
     <div class="row mx-0">

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

@@ -13,7 +13,10 @@
     <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
     <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
     <div class="row justify-content-between">
-      <div class="col-auto"><h4>불법조업 외국어선 처리현황</h4></div>
+      <div class="col-auto mb-2">
+        <div class="d-inline align-middle"><i class="bi bi-square-fill"></i></div>
+        <h5 class="d-inline align-middle"> 불법조업 외국어선 처리현황</h5>
+      </div>
       <div class="col-auto"><p class="mb-0 mt-2">외사통계 > 불법조업 외국어선 > 불법조업 외국어선 처리현황</p></div>
     </div>
     <div class="row mx-0">

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

@@ -13,7 +13,10 @@
     <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
     <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
     <div class="row justify-content-between">
-      <div class="col-auto"><h4>선원 세부 현황</h4></div>
+      <div class="col-auto mb-1">
+        <div class="d-inline align-middle"><i class="bi bi-square-fill"></i></div>
+        <h5 class="d-inline align-middle"> 선원 세부 현황</h5>
+      </div>
       <div class="col-auto"><p class="mb-0 mt-2">외사통계 > 불법조업 외국어선 > 선원 세부 현황</p></div>
     </div>
     <div class="row mx-0">

src/main/resources/templates/igActivities/fpiMgt/affair/affairStatistics.html

@@ -13,7 +13,10 @@
     <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
     <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
     <div class="row justify-content-between">
-      <div class="col-auto"><h4>견문통계</h4></div>
+      <div class="col-auto">
+        <div class="d-inline align-middle"><i class="bi bi-square-fill"></i></div>
+        <h5 class="d-inline align-middle"> 견문통계</h5>
+      </div>
       <div class="col-auto"><p class="mb-0 mt-2">첩보수집활동 > 견문통계</p></div>
     </div>
     <div class="row mx-0">

src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html

@@ -10,7 +10,10 @@
     <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
     <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
     <div class="row justify-content-between">
-      <div class="col-auto"><h4>청산보고서</h4></div>
+      <div class="col-auto">
+        <div class="d-inline align-middle"><i class="bi bi-square-fill"></i></div>
+        <h5 class="d-inline align-middle"> 청산보고서</h5>
+      </div>
       <div class="col-auto"><p class="mb-0 mt-2">첩보수집활동 > 외사경찰 견문관리 > 청산보고서</p></div>
     </div>
     <div class="row mx-0">

src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportList.html

@@ -10,7 +10,10 @@
     <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
     <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
     <div class="row justify-content-between">
-      <div class="col-auto"><h4>외사첩보망 해고(연장) 보고</h4></div>
+      <div class="col-auto">
+        <div class="d-inline align-middle"><i class="bi bi-square-fill"></i></div>
+        <h5 class="d-inline align-middle"> 외사첩보망 해고(연장) 보고</h5>
+      </div>
       <div class="col-auto"><p class="mb-0 mt-2">첩보수집활동 > 외사첩보망 견문관리 > 외사첩보망 해고(연장) 보고</p></div>
     </div>
     <div class="row mx-0">

src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html

@@ -10,7 +10,10 @@
     <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
     <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
     <div class="row justify-content-between">
-      <div class="col-auto"><h4>운영계획서</h4></div>
+      <div class="col-auto mb-2">
+        <div class="d-inline align-middle"><i class="bi bi-square-fill"></i></div>
+        <h5 class="d-inline align-middle"> 운영계획서</h5>
+      </div>
       <div class="col-auto"><p class="mb-0 mt-2">첩보수집활동 > 외사첩보망 견문관리 > 운영계획</p></div>
     </div>
     <div class="row mx-0">

src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html

@@ -67,36 +67,24 @@
                                             <table class="table table-sm table-hover table-bordered">
                                                 <thead>
                                                 <tr class="table-secondary">
-<!--                                                    <th></th>-->
+                                                    <th width="5%">순번</th>
-                                                    <th>종류</th>
+                                                    <th width="10%">작성일시</th>
+                                                    <th width="10%">종류</th>
                                                     <th>제목</th>
-                                                    <th>관서</th>
+                                                    <th>내용</th>
-                                                    <th>부서</th>
+                                                    <th width="10%">첨부파일</th>
-                                                    <th>계급</th>
-                                                    <th>작성자</th>
-                                                    <th>작성일시</th>
-                                                    <th>첨부파일</th>
                                                 </tr>
                                                 </thead>
                                                 <tbody class="table-group-divider">
-                                                <tr class="tr" th:each="major:${majorList}">
+                                                <tr class="tr" th:each="major, cnt:${majorList}">
                                                     <input type="hidden" class="majorKey" th:value="${major.majorKey}">
-<!--                                                    <td><input type="checkbox" class="trChkBox"></td>-->
+                                                    <td th:text="${cnt.count}"></td>
+                                                    <td th:text="${#temporals.format(major.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
                                                     <th:block th:each="commonCode:${session.commonCode.get('MST')}">
                                                     <td th:if="${major.majorType eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
                                                     </th:block>
                                                     <td th:text="|${major.contentStatus eq 'DST001'?'[임시]':''}${major.contentTitle}|"></td>
-                                                    <th:block th:each="commonCode:${session.commonCode.get('OG')}">
+                                                    <td th:utext="${major.contentInfo}"></td>
-                                                        <td th:if="${major.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                                                    </th:block>
-                                                    <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
-                                                        <td th:if="${major.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                                                    </th:block>
-                                                    <th:block th:each="commonCode:${session.commonCode.get('JT')}">
-                                                        <td th:if="${major.wrtUserGrd eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                                                    </th:block>
-                                                    <td th:text="${major.wrtUserNm}"></td>
-                                                    <td th:text="${#temporals.format(major.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
                                                     <td th:text="${major.fileCnt eq null?'파일 없음':#strings.concat(major.fileCnt,' 건')}"></td>
                                                 </tr>
                                                 </tbody>

src/main/resources/templates/login/joinForm.html

@@ -17,7 +17,7 @@
   </div>
   <div class="modal-body" th:if="${joinFlag eq 'T'}">
     <form id="userInfoInsert" action="#" th:action="@{/admin/insertUserInfo}" method="post">
-      <div class="mt-3 mb-1 row">
+      <div class="mb-3 mt-3 row">
         <label for="dicCode" class="col-sm-2 col-form-label col-form-label-sm text-center ">디지털식별코드</label>
         <div class="col-sm-3">
           <input type="text" class="form-control form-control-sm" id="dicCode" name="dicCode" autocomplete="off" th:value="${userInfo.dicCode}" disabled>

src/main/resources/templates/login/login_back.html

@@ -59,7 +59,7 @@
         </div>
         <div class="modal-body">
           <div class="mb-3 mt-3 row">
-            <label for="dicCode" class="col-sm-2 col-form-label col-form-label-sm text-center ">공무원식별번호</label>
+            <label for="dicCode" class="col-sm-2 col-form-label col-form-label-sm text-center ">디지털식별코드</label>
             <div class="col-sm-3">
               <input type="text" class="form-control form-control-sm" id="dicCode" name="dicCode" autocomplete="off">
             </div>

src/main/resources/templates/police/police/policeEditModal.html

@@ -20,7 +20,7 @@
     <input type="hidden" name="userSeq" id="userSeq" class="userSeq" th:value="${userInfo.userSeq}">
     <input type="hidden" name="userStatus" th:value="${userInfo.userStatus}">
     <div class="mb-3 mt-3 row">
-      <label for="dicCode" class="col-sm-2 col-form-label col-form-label-sm text-center ">공무원식별번호</label>
+      <label for="dicCode" class="col-sm-2 col-form-label col-form-label-sm text-center ">디지털식별코드</label>
       <div class="col-sm-4">
         <input type="text" class="form-control form-control-sm" id="dicCode" name="dicCode" autocomplete="off" th:value="${userInfo.dicCode}">
       </div>
@@ -148,7 +148,7 @@
     <th:block th:if="${accessAuth eq 'ACC003'}">
       <button type="button" class="btn btn-info" id="syncToKwmsBtn" th:disabled="${#strings.isEmpty(userInfo.dicCode)}">인사시스템 정보 불러오기</button>
       <th:block th:if="${#strings.isEmpty(userInfo.dicCode)}">
-        <label for="syncToKwmsBtn" style="font-size: 12px">공무원식별번호가 필요합니다.</label>
+        <label for="syncToKwmsBtn" style="font-size: 12px">디지털식별코드가 필요합니다.</label>
       </th:block>
     </th:block>
   </div>

src/main/resources/templates/police/police/policeHistory.html

@@ -52,7 +52,7 @@
         </div>
         <div class="col-8" id="valueDiv">
           <div class="mb-1 mt-3 row">
-            <label for="dicCode" class="col-sm-2 col-form-label col-form-label-sm text-center ">공무원식별번호</label>
+            <label for="dicCode" class="col-sm-2 col-form-label col-form-label-sm text-center ">디지털식별코드</label>
             <div class="col-sm-4">
               <input type="text" class="form-control form-control-sm dateSelector" id="vDicCode"readonly>
             </div>

src/main/resources/templates/sri/sriBoard.html

@@ -11,7 +11,10 @@
     <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
     <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
     <div class="row justify-content-between">
-      <div class="col-auto"><h4>SRI</h4></div>
+      <div class="col-auto">
+        <div class="d-inline align-middle"><i class="bi bi-square-fill"></i></div>
+        <h5 class="d-inline align-middle"> SRI</h5>
+      </div>
       <div class="col-auto"><p class="mb-0 mt-2">첩보수집활동 > SRI</p></div>
     </div>
     <div class="row mx-0">

src/main/resources/templates/user/myInfo.html

@@ -36,7 +36,7 @@
                     <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
                     <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
                     <div class="mb-3 mt-3 row">
-                      <label for="dicCode" class="col-sm-2 col-form-label col-form-label-sm text-center ">공무원식별번호</label>
+                      <label for="dicCode" class="col-sm-2 col-form-label col-form-label-sm text-center ">디지털식별코드</label>
                       <div class="col-sm-4">
                         <input type="text" class="form-control form-control-sm" id="dicCode" name="dicCode" autocomplete="off" th:value="${userInfo.dicCode}">
                       </div>
@@ -44,7 +44,7 @@
                         <div class="row justify-content-end">
                           <div class="col-auto">
                             <button type="button" class="btn btn-sm btn-info" id="syncBtn" th:disabled="${#strings.isEmpty(userInfo.dicCode)}">인사시스템 정보 연동</button>
-                            <label for="syncBtn" class="fs-12" th:if="${#strings.isEmpty(userInfo.dicCode)}">공무원식별번호가 필요합니다.</label>
+                            <label for="syncBtn" class="fs-12" th:if="${#strings.isEmpty(userInfo.dicCode)}">디지털식별코드가 필요합니다.</label>
                           </div>
                           <div class="col-auto">
                             <button type="button" class="btn btn-sm btn-success" id="updateBtn">수정</button>