From bdc9bd7a9ab360dd88fbb4e7d43c552859bedb59 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, 10 Jan 2023 17:00:52 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9B=94=EA=B0=84=EA=B3=84=ED=9A=8D=20?=
 =?UTF-8?q?=EA=B2=B0=EC=A0=9C=20=EC=98=A4=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

---
 .../dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java | 2 +-
 .../igActivities/fpiMgt/affairPlan/planViewModal.html          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java
index ad078251..4a12cc7a 100644
--- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java
+++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java
@@ -101,7 +101,7 @@ public class PlanService extends BaseService { // 월간계획
         userAlarmService.sendAlarmToWrtUser(savedPlan.getPlanKey(), savedPlan.getWrtUserSeq(), 29, savedPlan.getContentTitle()+" 문서가 승인되었습니다.");
         break;
     }
-    return apprv.getApprvSeq();
+    return apprv.getPlanKey();
   }
 
   private Integer savePlanMainInfos(Integer planKey, Integer planSeq, String infoType, List<String> infoList){
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html
index bee244c3..1c136756 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html
@@ -109,7 +109,8 @@
         </th:block>
       </th:block>
     </div>
-    <div class="col-12" th:if="${apprvAuth ne null}">
+    <div class="col-12" th:if="${(apprvAuth eq 'APC003' or apprvAuth eq 'APC004') and plan.planState eq 'DST002'
+                                or (apprvAuth eq 'APC001' or apprvAuth eq 'APC002') and plan.planState eq 'DST004'}">
       <form action="#" method="post" id="apprvForm">
         <div class="row">
           <div class="col-10">