From f3224dcc8372d07cf6a2628a08156966ef69f44d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EA=B0=95=EC=84=9D?= <cks0504_p@daum.net>
Date: Mon, 6 Nov 2023 14:11:53 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=B2=A9=EB=B3=B4=EB=A7=9D?=
 =?UTF-8?q?=20>=20=EC=9A=B4=EC=98=81=EC=8B=A4=EC=A0=81=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../igActivities/intelligenceNetwork/intelligenceAnalyze.js  | 5 +++--
 .../intelligenceNetwork/intelligenceAnalyzeViewModal.html    | 5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/static/js/igActivities/intelligenceNetwork/intelligenceAnalyze.js b/src/main/resources/static/js/igActivities/intelligenceNetwork/intelligenceAnalyze.js
index b16dbceb..bd6a63ea 100644
--- a/src/main/resources/static/js/igActivities/intelligenceNetwork/intelligenceAnalyze.js
+++ b/src/main/resources/static/js/igActivities/intelligenceNetwork/intelligenceAnalyze.js
@@ -225,9 +225,10 @@ function getIntelligenceAnalyzeViewModal(iaKey){
 }
 
 $(document).on('click', '.apprvBtn', function (){
-  $("#viewModalApprvValue").val($(this).attr("data-planstate"));
-  const approval = $(this).val();
+  const btn = $(this)
+  const approval = btn[0].innerText;
   if(confirm(approval+"하시겠습니까?")){
+    $("#viewModalApprvValue").val(btn.attr("data-planstate"));
     const formData = new FormData($("#apprvForm")[0]);
     contentFade("in")
     $.ajax({
diff --git a/src/main/resources/templates/igActivities/intelligenceNetwork/intelligenceAnalyzeViewModal.html b/src/main/resources/templates/igActivities/intelligenceNetwork/intelligenceAnalyzeViewModal.html
index 8383e500..58b11eb5 100644
--- a/src/main/resources/templates/igActivities/intelligenceNetwork/intelligenceAnalyzeViewModal.html
+++ b/src/main/resources/templates/igActivities/intelligenceNetwork/intelligenceAnalyzeViewModal.html
@@ -161,13 +161,12 @@
         </th:block>
       </div>
     </div>
-    <div class="col-12" th:if="${(apprvAuth eq 'APC001' or apprvAuth eq 'APC002') and ia.iaState eq 'DST002'}">
+    <div class="col-12" th:if="${(ia.iaState eq 'DST002' and (#strings.contains(apprvAuth, 'APC003') or #strings.contains(apprvAuth, 'APC004')))
+                                or (ia.iaState eq 'DST004' and (#strings.contains(apprvAuth, 'APC001') or #strings.contains(apprvAuth, 'APC002')))}">
       <hr>
       <form action="#" method="post" id="apprvForm">
         <div class="row">
           <input type="hidden" name="iaKey" th:value="${ia.iaKey}">
-          ]
-
           <input type="hidden" name="state" id="viewModalApprvValue">
           <div class="row">
             <label class="col-sm-1 col-form-label col-form-label-sm text-center">관리관 의견</label>