외사정보관리~방첩공작 권한별 버튼 점검, 수정.

src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java

@@ -42,10 +42,10 @@ public class CounterIntelligenceController {
     mav.addObject("accessAuth", accessAuth);
     if(accessAuth.equals("ACC003")){
       mav.addObject("downOrganCdList", loginUser.getDownOrganCdList());
+      ciWork.setDownOrganCdList(loginUser.getDownOrganCdList());
     }else{
-      ciWork.setWrtUserSeq(loginUser.getUserSeq());
+      ciWork.setWrtOrgan(loginUser.getOgCd());
     }
-
     ciWork.setQueryInfo();
     mav.addObject("ciWorkList", ciService.selectCounterIntelligenceWorkList(ciWork));
     ciWork.setContentCnt(ciService.selectCounterIntelligenceWorkCnt(ciWork));

src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml

@@ -70,6 +70,12 @@
           and a.wrt_dt <= #{endDate}::date+1
         </if>
       </if>
+      <if test="downOrganCdList != null">
+        and a.wrt_organ in
+        <foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
+          #{organCd}
+        </foreach>
+      </if>
     </where>
   </sql>
   <select id="selectCounterIntelligenceWorkList" parameterType="CounterIntelligenceWork" resultType="CounterIntelligenceWork">

src/main/resources/static/js/faRpt/faRpt.js

@@ -154,9 +154,10 @@ function saveFaRpt(faRptState){
         contentType: false,
         success : function(result) {
           alert("송신 되었습니다.");
-          contentFade("out");
+          location.reload();
+          /*contentFade("out");
           $("#faRptEditModal").modal('hide');
-          getFaRptViewModal(result);
+          getFaRptViewModal(result);*/
         },
         error : function(xhr, status) {
           alert("송신에 실패하였습니다.")

src/main/resources/static/js/ivsgt/ivsgt.js

@@ -158,9 +158,10 @@ function saveBoardInvestigation(contentState){
         contentType: false,
         success : function(result) {
           alert("저장되었습니다.");
-          contentFade("out");
+          location.reload();
+          /*contentFade("out");
           $("#ivsgtEditModal").modal('hide');
-          getIvsgtViewModal(result);
+          getIvsgtViewModal(result);*/
         },
         error : function(xhr, status) {
           alert("저장에 실패하였습니다.")

src/main/resources/templates/counterIntelligence/ciWork/ciWorkViewModal.html

@@ -97,14 +97,10 @@
     </div>
   </div>
 </div>
+<th:block th:if="${viewUserSeq eq ciWork.wrtUserSeq or accessAuth eq 'ACC003'}">
   <div class="modal-footer bg-light">
-  <th:block th:if="${accessAuth eq 'ACC003'}">
     <button type="button" class="btn btn-danger" id="deleteCiWorkBtn" th:data-ciwkey="${ciWork.ciwKey}">삭제</button>
-  </th:block>
-  <th:block th:if="${viewUserSeq eq ciWork.wrtUserSeq}">
     <button type="button" class="btn btn-warning" id="editCiWorkBtn" th:data-ciwkey="${ciWork.ciwKey}">수정</button>
-  </th:block>
-<!--
-  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
--->
+    <!-- <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button> -->
   </div>
+</th:block>

src/main/resources/templates/faRpt/faRptViewModal.html

@@ -113,12 +113,14 @@
   </div>
 </div>
 <div class="modal-footer bg-light">
-  <th:block th:if="${userSeq eq faRpt.wrtUserSeq}">
+  <th:block th:if="${userSeq eq faRpt.wrtUserSeq and accessAuth eq 'ACC003'}">
     <button type="button" class="btn btn-warning" id="editFaRptBtn" th:data-farptkey="${faRpt.faRptKey}">수정</button>
   </th:block>
-  <th:block th:if="${userSeq ne faRpt.wrtUserSeq}">
+  <th:block th:each="readUser:${faRpt.readUserList}">
+    <th:block th:if="${readUser.userSeq eq userSeq}">
       <button type="button" class="btn btn-success" id="reSendBtn" th:data-farptkey="${faRpt.faRptKey}">회신</button>
     </th:block>
+  </th:block>
 <!--
   <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
 -->

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

@@ -172,7 +172,9 @@
                     </nav>
                   </div>
                   <div class="col-auto">
+                    <th:block th:if="${accessAuth ne 'ACC001'}">
                       <button class="btn btn-primary" id="ivsgtAddBtn">등록</button>
+                    </th:block>
                   </div>
                 </div>
               </div>