From a85d179341dc620a64a892a4ce044d9fb8068ee4 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 18:04:22 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=A0=95=EB=B3=B4=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC~=EB=B0=A9=EC=B2=A9=EA=B3=B5=EC=9E=91=20=EA=B6=8C?=
 =?UTF-8?q?=ED=95=9C=EB=B3=84=20=EB=B2=84=ED=8A=BC=20=EC=A0=90=EA=B2=80,?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CounterIntelligenceController.java             |  4 ++--
 .../mybatisMapper/CounterIntelligenceMapper.xml    |  6 ++++++
 src/main/resources/static/js/faRpt/faRpt.js        |  5 +++--
 src/main/resources/static/js/ivsgt/ivsgt.js        |  5 +++--
 .../ciWork/ciWorkViewModal.html                    | 14 +++++---------
 .../resources/templates/faRpt/faRptViewModal.html  |  8 +++++---
 src/main/resources/templates/ivsgt/ivsgt.html      |  4 +++-
 7 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java
index f88ccb30..deef5045 100644
--- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java
+++ b/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));
diff --git a/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml b/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml
index 507a11ef..dd1dcda6 100644
--- a/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml
+++ b/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml
@@ -70,6 +70,12 @@
           and a.wrt_dt &lt;= #{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">
diff --git a/src/main/resources/static/js/faRpt/faRpt.js b/src/main/resources/static/js/faRpt/faRpt.js
index 924617bc..cc5b89ae 100644
--- a/src/main/resources/static/js/faRpt/faRpt.js
+++ b/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("송신에 실패하였습니다.")
diff --git a/src/main/resources/static/js/ivsgt/ivsgt.js b/src/main/resources/static/js/ivsgt/ivsgt.js
index 56eaa20c..417fbb7f 100644
--- a/src/main/resources/static/js/ivsgt/ivsgt.js
+++ b/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("저장에 실패하였습니다.")
diff --git a/src/main/resources/templates/counterIntelligence/ciWork/ciWorkViewModal.html b/src/main/resources/templates/counterIntelligence/ciWork/ciWorkViewModal.html
index 0b59a0fb..5b01e53e 100644
--- a/src/main/resources/templates/counterIntelligence/ciWork/ciWorkViewModal.html
+++ b/src/main/resources/templates/counterIntelligence/ciWork/ciWorkViewModal.html
@@ -97,14 +97,10 @@
     </div>
   </div>
 </div>
-<div class="modal-footer bg-light">
-  <th:block th:if="${accessAuth eq 'ACC003'}">
+<th:block th:if="${viewUserSeq eq ciWork.wrtUserSeq or accessAuth eq 'ACC003'}">
+  <div class="modal-footer bg-light">
     <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>
--->
-</div>
\ No newline at end of file
+    <!-- <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button> -->
+  </div>
+</th:block>
\ No newline at end of file
diff --git a/src/main/resources/templates/faRpt/faRptViewModal.html b/src/main/resources/templates/faRpt/faRptViewModal.html
index 47d586f7..08b514fc 100644
--- a/src/main/resources/templates/faRpt/faRptViewModal.html
+++ b/src/main/resources/templates/faRpt/faRptViewModal.html
@@ -113,11 +113,13 @@
   </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}">
-    <button type="button" class="btn btn-success" id="reSendBtn" th:data-farptkey="${faRpt.faRptKey}">회신</button>
+  <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>
diff --git a/src/main/resources/templates/ivsgt/ivsgt.html b/src/main/resources/templates/ivsgt/ivsgt.html
index ac23f194..726ce2b3 100644
--- a/src/main/resources/templates/ivsgt/ivsgt.html
+++ b/src/main/resources/templates/ivsgt/ivsgt.html
@@ -172,7 +172,9 @@
                     </nav>
                   </div>
                   <div class="col-auto">
-                    <button class="btn btn-primary" id="ivsgtAddBtn">등록</button>
+                    <th:block th:if="${accessAuth ne 'ACC001'}">
+                      <button class="btn btn-primary" id="ivsgtAddBtn">등록</button>
+                    </th:block>
                   </div>
                 </div>
               </div>