From 580952a95b79af6cf7ab564977ff06271a064ed0 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: Thu, 20 Oct 2022 15:04:23 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EB=AC=B8=EA=B4=80=EB=A6=AC=20?=
 =?UTF-8?q?=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

---
 .../java/com/dbnt/faisp/fpiMgt/affair/AffairController.java | 6 ++++--
 src/main/resources/static/js/dashboard.js                   | 3 ++-
 .../static/js/igActivities/fpiMgt/affair/affairMgt.js       | 5 ++++-
 .../igActivities/fpiMgt/affair/affairMgtDashboard.html      | 5 +++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java b/src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java
index d6cbba4a..c6833ec7 100644
--- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java
+++ b/src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java
@@ -204,8 +204,10 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관
     mav.addObject("userSeq",loginUser.getUserSeq());
     mav.addObject("userOrgan", loginUser.getOgCd());
     //메뉴권한 확인
-    mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affair/affairMgt").get(0).getAccessAuth());
-    String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affair/affairMgt").get(0).getApprovalAuth();
+    mav.addObject("accessAuth", authMgtService.selectAccessConfigList
+        (loginUser.getUserSeq(), "/affair/affairMgt?affairCategory="+affairBoard.getAffairCategory()).get(0).getAccessAuth());
+    String apprvAuth = authMgtService.selectApprovalConfigList
+        (loginUser.getUserSeq(), "/affair/affairMgt?affairCategory="+affairBoard.getAffairCategory()).get(0).getApprovalAuth();
     mav.addObject("apprvAuth", apprvAuth);
     if(apprvAuth!=null && (apprvAuth.equals("APC002") || apprvAuth.equals("APC001"))){
       mav.addObject("ratingCodeList", codeMgtService.selectCodeMgtList("AAR"));
diff --git a/src/main/resources/static/js/dashboard.js b/src/main/resources/static/js/dashboard.js
index 70d87c9b..14c10fc8 100644
--- a/src/main/resources/static/js/dashboard.js
+++ b/src/main/resources/static/js/dashboard.js
@@ -16,9 +16,10 @@ $(function (){
 function getSubPage(menuList){
   $.each(menuList, function(idx, menu){
     if(idx<6){
+      const url = menu.menuUrl+(menu.menuUrl.includes('?')?'&dashboardFlag=true':'?dashboardFlag=true');
       $.ajax({
         type : 'GET',
-        url : menu.menuUrl+"?dashboardFlag=true",
+        url : url,
         dataType:"html",
         success : function(html) {
           $("#subPage"+idx).append(html);
diff --git a/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js
index e61f6c81..8587cea9 100644
--- a/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js
+++ b/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js
@@ -130,7 +130,10 @@ $(document).on('change', '.apprvChkbox', function (){
 function getAffairViewModal(affairKey){
   $.ajax({
     url: '/affair/affairViewModal',
-    data: {affairKey: affairKey},
+    data: {
+      affairKey: affairKey,
+      affairCategory: $("#affairCategory").val()
+    },
     type: 'GET',
     dataType:"html",
     success: function(html){
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgtDashboard.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgtDashboard.html
index e63d115d..316b25d0 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgtDashboard.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgtDashboard.html
@@ -4,11 +4,12 @@
 <div class="card">
   <div class="card-header bg-white">
     <div class="row justify-content-between">
-      <div class="col-auto">외사경찰 견문관리</div>
-      <div class="col-auto"><a href="/affair/affairMgt" class="link-dark"><i class="bi bi-list"></i></a></div>
+      <div class="col-auto" th:text="${#strings.concat((searchParams.affairCategory eq 'CAT215'?'외사경찰':'외사첩보망'), ' 견문관리')}"></div>
+      <div class="col-auto"><a th:href="|/affair/affairMgt?affairCategory=${searchParams.affairCategory}|" class="link-dark"><i class="bi bi-list"></i></a></div>
     </div>
   </div>
   <div class="card-body">
+    <input type="hidden" id="affairCategory" th:value="${searchParams.affairCategory}">
     <table class="table table-hover">
       <thead>
       <tr>