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 @@