From a6ed621285dc96c3b938552dcd1bba020f6545b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Thu, 20 Oct 2022 13:53:22 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EB=89=B4=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=97=AC=EB=B6=80=20=EC=BB=AC=EB=9F=BC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80.=20=EC=99=B8=EC=82=AC=EC=B2=A9=EB=B3=B4?= =?UTF-8?q?=EB=A7=9D=20=EA=B2=AC=EB=AC=B8=EA=B4=80=EB=A6=AC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../faisp/fpiMgt/affair/AffairController.java | 18 ++++++++++++------ .../faisp/fpiMgt/affair/model/AffairBoard.java | 2 ++ .../com/dbnt/faisp/menuMgt/model/MenuMgt.java | 4 ++++ .../resources/mybatisMapper/AffairMapper.xml | 3 +++ .../resources/mybatisMapper/AuthMgtMapper.xml | 4 ++-- .../resources/mybatisMapper/menuMgtMapper.xml | 11 +++++++---- .../js/igActivities/fpiMgt/affair/affairMgt.js | 11 +++++++---- .../resources/static/js/menuMgt/menuMgt.js | 3 ++- .../adminPage/menuMgt/menuEditModal.html | 8 +++++++- .../templates/adminPage/menuMgt/menuMgt.html | 3 +++ .../fpiMgt/affair/affairEditModal.html | 1 + .../igActivities/fpiMgt/affair/affairMgt.html | 3 ++- 12 files changed, 52 insertions(+), 19 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 ddecef47..d6cbba4a 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/affair/AffairController.java @@ -39,7 +39,8 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 mav.addObject("page", "main"); mav.addObject("searchUrl", "/affair/affairMgt"); //메뉴권한 확인 - String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affair/affairMgt").get(0).getAccessAuth(); + String accessAuth = authMgtService.selectAccessConfigList + (loginUser.getUserSeq(), "/affair/affairMgt?affairCategory="+affairBoard.getAffairCategory()).get(0).getAccessAuth(); switch (accessAuth){ case "ACC001": // 조회 case "ACC002": // 작성 @@ -51,7 +52,8 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 break; } //결재권한 확인 - String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affair/affairMgt").get(0).getApprovalAuth(); + String apprvAuth = authMgtService.selectApprovalConfigList + (loginUser.getUserSeq(), "/affair/affairMgt?affairCategory="+affairBoard.getAffairCategory()).get(0).getApprovalAuth(); affairBoard.setRatingOrgan(loginUser.getOgCd()); mav.addObject("accessAuth", accessAuth); @@ -70,7 +72,8 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 mav.addObject("page", "stay"); mav.addObject("searchUrl", "/affair/stayPage"); //메뉴권한 확인 - String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affair/affairMgt").get(0).getAccessAuth(); + String accessAuth = authMgtService.selectAccessConfigList + (loginUser.getUserSeq(), "/affair/affairMgt?affairCategory="+affairBoard.getAffairCategory()).get(0).getAccessAuth(); switch (accessAuth){ case "ACC001": // 조회 case "ACC002": // 작성 @@ -81,7 +84,8 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 break; } //결재권한 확인 - String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affair/affairMgt").get(0).getApprovalAuth(); + String apprvAuth = authMgtService.selectApprovalConfigList + (loginUser.getUserSeq(), "/affair/affairMgt?affairCategory="+affairBoard.getAffairCategory()).get(0).getApprovalAuth(); affairBoard.setRatingOrgan(loginUser.getOgCd()); if(apprvAuth==null) { if(!accessAuth.equals("ACC003")){ @@ -121,7 +125,8 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 mav.addObject("page", "commit"); mav.addObject("searchUrl", "/affair/commitPage"); //메뉴권한 확인 - String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affair/affairMgt").get(0).getAccessAuth(); + String accessAuth = authMgtService.selectAccessConfigList + (loginUser.getUserSeq(), "/affair/affairMgt?affairCategory="+affairBoard.getAffairCategory()).get(0).getAccessAuth(); switch (accessAuth){ case "ACC001": // 조회 case "ACC002": // 작성 @@ -132,7 +137,8 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 break; } //결재권한 확인 - String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affair/affairMgt").get(0).getApprovalAuth(); + String apprvAuth = authMgtService.selectApprovalConfigList + (loginUser.getUserSeq(), "/affair/affairMgt?affairCategory="+affairBoard.getAffairCategory()).get(0).getApprovalAuth(); affairBoard.setRatingOrgan(loginUser.getOgCd()); if(apprvAuth==null) { if(!accessAuth.equals("ACC003")){ diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairBoard.java b/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairBoard.java index 85a6d6c5..059cb69f 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairBoard.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/affair/model/AffairBoard.java @@ -59,6 +59,8 @@ public class AffairBoard extends BaseModel { private LocalDate autoDelete; @Column(name = "view_status") private String viewStatus; + @Column(name = "affair_category") + private String affairCategory; @Transient private String organUp; diff --git a/src/main/java/com/dbnt/faisp/menuMgt/model/MenuMgt.java b/src/main/java/com/dbnt/faisp/menuMgt/model/MenuMgt.java index 27c08ae5..9c465d86 100644 --- a/src/main/java/com/dbnt/faisp/menuMgt/model/MenuMgt.java +++ b/src/main/java/com/dbnt/faisp/menuMgt/model/MenuMgt.java @@ -32,6 +32,10 @@ public class MenuMgt extends BaseModel { private String menuUrl; @Column(name = "approval_chk") private String approvalChk; + @Column(name = "deadline_chk") + private String deadlineChk; + @Column(name = "use_chk") + private String useChk; @Transient private List childList; diff --git a/src/main/resources/mybatisMapper/AffairMapper.xml b/src/main/resources/mybatisMapper/AffairMapper.xml index c0bb96d9..62e1dbac 100644 --- a/src/main/resources/mybatisMapper/AffairMapper.xml +++ b/src/main/resources/mybatisMapper/AffairMapper.xml @@ -6,6 +6,9 @@ + + and a.affair_category = #{affairCategory} + and a.wrt_user_seq = #{wrtUserSeq} diff --git a/src/main/resources/mybatisMapper/AuthMgtMapper.xml b/src/main/resources/mybatisMapper/AuthMgtMapper.xml index 16be6cde..cbd78887 100644 --- a/src/main/resources/mybatisMapper/AuthMgtMapper.xml +++ b/src/main/resources/mybatisMapper/AuthMgtMapper.xml @@ -13,11 +13,10 @@ from menu_mgt a left outer join access_config b on a.menu_key = b.menu_key and b.user_seq = #{userSeq} - + where a.use_chk = 'T' and a.menu_url = #{menuUrl} - order by cat1_cd, cat2_cd, cat3_cd @@ -31,6 +30,7 @@ left outer join approval_config b on a.menu_key = b.menu_key and b.user_seq = #{userSeq} where a.approval_chk = 'T' + and a.use_chk = 'T' and a.menu_url = #{menuUrl} diff --git a/src/main/resources/mybatisMapper/menuMgtMapper.xml b/src/main/resources/mybatisMapper/menuMgtMapper.xml index 134f67b2..214e5da5 100644 --- a/src/main/resources/mybatisMapper/menuMgtMapper.xml +++ b/src/main/resources/mybatisMapper/menuMgtMapper.xml @@ -24,7 +24,9 @@ cat2_cd as cat2Cd, cat3_cd as cat3Cd, menu_url as menuUrl, - approval_chk as approvalChk + approval_chk as approvalChk, + deadline_chk as deadlineChk, + use_chk as useChk from menu_mgt @@ -49,6 +51,7 @@ inner join menu_mgt ab on aa.menu_key = ab.menu_key where aa.user_seq = #{userSeq} and aa.access_auth is not null + and aa.access_auth <> '' order by cat1_cd, cat2_cd, cat3_cd @@ -62,6 +65,7 @@ inner join menu_mgt ab on aa.menu_key = ab.menu_key where aa.user_seq = #{userSeq} and aa.access_auth is not null + and aa.access_auth <> '' order by cat1_cd, cat2_cd, cat3_cd limit #{rowCnt} offset #{firstIndex} @@ -73,8 +77,7 @@ inner join menu_mgt ab on aa.menu_key = ab.menu_key where aa.user_seq = #{userSeq} and aa.access_auth is not null - - - + and aa.access_auth <> '' + \ No newline at end of file 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 1c9b57b2..e61f6c81 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js @@ -6,13 +6,13 @@ $(function(){ }); }) $(document).on('click', '#affairTab', function (){ - location.href = "/affair/affairMgt"; + location.href = "/affair/affairMgt?affairCategory="+$("#affairCategory").val(); }) $(document).on('click', '#stayTab', function (){ - location.href = "/affair/stayPage"; + location.href = "/affair/stayPage?affairCategory="+$("#affairCategory").val(); }) $(document).on('click', '#commitTab', function (){ - location.href = "/affair/commitPage"; + location.href = "/affair/commitPage?affairCategory="+$("#affairCategory").val(); }) $(document).on('click', '.affairTr', function (event){ const target = event.target; @@ -146,7 +146,10 @@ function getAffairViewModal(affairKey){ function getAffairEditModal(affairKey){ $.ajax({ url: '/affair/affairEditModal', - data: {affairKey: affairKey}, + data: { + affairKey: affairKey, + affairCategory: $("#affairCategory").val() + }, type: 'GET', dataType:"html", success: function(html){ diff --git a/src/main/resources/static/js/menuMgt/menuMgt.js b/src/main/resources/static/js/menuMgt/menuMgt.js index d0409618..b580cde3 100644 --- a/src/main/resources/static/js/menuMgt/menuMgt.js +++ b/src/main/resources/static/js/menuMgt/menuMgt.js @@ -14,7 +14,8 @@ $(document).on('click', '.menuTr', function (event){ cat2Cd: row.find(".cat2Cd").val(), cat3Cd: row.find(".cat3Cd").val(), menuUrl: row.find(".menuUrl").val(), - approvalChk: row.find(".approvalChk").val() + approvalChk: row.find(".approvalChk").val(), + useChk: row.find(".useChk").val() }) } } diff --git a/src/main/resources/templates/adminPage/menuMgt/menuEditModal.html b/src/main/resources/templates/adminPage/menuMgt/menuEditModal.html index 73fa5f37..2c0181cf 100644 --- a/src/main/resources/templates/adminPage/menuMgt/menuEditModal.html +++ b/src/main/resources/templates/adminPage/menuMgt/menuEditModal.html @@ -50,11 +50,17 @@
- +
+
+ +
+ +
+
diff --git a/src/main/resources/templates/adminPage/menuMgt/menuMgt.html b/src/main/resources/templates/adminPage/menuMgt/menuMgt.html index 9ac12111..8487921f 100644 --- a/src/main/resources/templates/adminPage/menuMgt/menuMgt.html +++ b/src/main/resources/templates/adminPage/menuMgt/menuMgt.html @@ -70,6 +70,7 @@ 중분류 소분류 url + 사용여부 @@ -80,6 +81,7 @@ + @@ -102,6 +104,7 @@ + diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html index 96509a00..7530d8f1 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html @@ -9,6 +9,7 @@ + diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html index 23a0954b..8265ba99 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html @@ -7,7 +7,7 @@
-

첩보수집활동 > 외사경찰 견문관리 > 견문관리

+

견문관리

@@ -27,6 +27,7 @@
+