diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java index 1ddbd0f2..706e6aaf 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java @@ -181,6 +181,7 @@ public class PlanController { // 첩보수집활동 > 외사경찰 견문관리 planBoard = planService.selectPlanBoard(planBoard.getPlanKey()); mav.addObject("plan", planBoard); mav.addObject("userSeq",loginUser.getUserSeq()); + mav.addObject("viewOrgan",loginUser.getOgCd()); mav.addObject("lineSeparator", '\n'); //메뉴권한 확인 mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affairPlan/planMgt").get(0).getAccessAuth()); diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java index b4c2c0fc..fec0402f 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java @@ -222,6 +222,7 @@ public class ResultController { // 첩보수집활동 > 외사경찰 견문관 resultBoard = resultService.selectResultBoard(resultBoard.getResultKey()); mav.addObject("result", resultBoard); mav.addObject("userSeq",loginUser.getUserSeq()); + mav.addObject("viewOrgan",loginUser.getOgCd()); //메뉴권한 확인 mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affairResult/resultMgt").get(0).getAccessAuth()); mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affairResult/resultMgt").get(0).getApprovalAuth()); diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java index 3b06a011..3311f192 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java @@ -141,6 +141,7 @@ public class IntelligenceNetworkController { op = intelligenceNetworkService.selectOperationPlan(op.getOpKey()); mav.addObject("op", op); mav.addObject("userSeq",loginUser.getUserSeq()); + mav.addObject("viewOrgan",loginUser.getOgCd()); //메뉴권한 확인 mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/operationPlanList/all").get(0).getAccessAuth()); mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/operationPlanList/all").get(0).getApprovalAuth()); @@ -292,6 +293,7 @@ public class IntelligenceNetworkController { ia.setApprvList(intelligenceNetworkService.selectIntelligenceAnalyzeApprv(ia)); mav.addObject("ia", ia); mav.addObject("userSeq",loginUser.getUserSeq()); + mav.addObject("viewOrgan",loginUser.getOgCd()); //메뉴권한 확인 mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/intelligenceAnalyzeList/all").get(0).getAccessAuth()); mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/intelligenceAnalyzeList/all").get(0).getApprovalAuth()); @@ -444,6 +446,7 @@ public class IntelligenceNetworkController { fer = intelligenceNetworkService.selectFireExtensionReportInfo(fer); mav.addObject("fer", fer); mav.addObject("userSeq",loginUser.getUserSeq()); + mav.addObject("viewOrgan",loginUser.getOgCd()); //메뉴권한 확인 mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/fireExtensionReportList/all").get(0).getAccessAuth()); mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/fireExtensionReportList/all").get(0).getApprovalAuth()); diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java index cde29d00..81eb63ff 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java @@ -146,6 +146,7 @@ public class MonitoringController { // 첩보수집활동 > 해양외사모니 md = monitoringService.selectDesignation(md.getMdKey()); mav.addObject("md", md); mav.addObject("userSeq",loginUser.getUserSeq()); + mav.addObject("viewOrgan",loginUser.getOgCd()); //메뉴권한 확인 mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/monitoring/designationList/all").get(0).getAccessAuth()); mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/monitoring/designationList/all").get(0).getApprovalAuth()); @@ -295,6 +296,7 @@ public class MonitoringController { // 첩보수집활동 > 해양외사모니 mr = monitoringService.selectResult(mr.getMrKey()); mav.addObject("mr", mr); mav.addObject("userSeq",loginUser.getUserSeq()); + mav.addObject("viewOrgan",loginUser.getOgCd()); //메뉴권한 확인 mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/monitoring/resultList/all").get(0).getAccessAuth()); mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/monitoring/resultList/all").get(0).getApprovalAuth()); diff --git a/src/main/resources/mybatisMapper/AffairMapper.xml b/src/main/resources/mybatisMapper/AffairMapper.xml index de8e0bf7..454489cc 100644 --- a/src/main/resources/mybatisMapper/AffairMapper.xml +++ b/src/main/resources/mybatisMapper/AffairMapper.xml @@ -295,23 +295,25 @@ a.content_title as title, a.wrt_dt from plan_board a - where ( - a.wrt_user_seq = #{userSeq} - or ( - a.plan_state = 'DST002' and - ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' + where + a.wrt_organ = #{ogCd} + and ( + a.wrt_user_seq = #{userSeq} + or ( + a.plan_state = 'DST002' and + ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' + from menu_mgt aa + left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} + where aa.menu_key = 29) + ) + or ( + a.plan_state = 'DST004' and + ( select ab.approval_auth ~ 'APC001' or ab.approval_auth ~ 'APC002' from menu_mgt aa left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} where aa.menu_key = 29) + ) ) - or ( - a.plan_state = 'DST004' and - ( select ab.approval_auth ~ 'APC001' or ab.approval_auth ~ 'APC002' - from menu_mgt aa - left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} - where aa.menu_key = 29) - ) - ) union all select 30 as board, a.affair_key as key, @@ -342,44 +344,48 @@ a.clear_title as title, a.wrt_dt from result_board a - where ( - a.wrt_user_seq = #{userSeq} or ( - a.result_state = 'DST002' and - ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' - from menu_mgt aa - left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} - where aa.menu_key = 31) - ) or ( - a.result_state = 'DST004' and - ( select ab.approval_auth ~ 'APC001' or ab.approval_auth ~ 'APC002' - from menu_mgt aa - left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} - where aa.menu_key = 31) + where + a.wrt_organ = #{ogCd} + and ( + a.wrt_user_seq = #{userSeq} or ( + a.result_state = 'DST002' and + ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' + from menu_mgt aa + left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} + where aa.menu_key = 31) + ) or ( + a.result_state = 'DST004' and + ( select ab.approval_auth ~ 'APC001' or ab.approval_auth ~ 'APC002' + from menu_mgt aa + left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} + where aa.menu_key = 31) + ) ) - ) union all select 32 as board, a.op_key as key, a.op_sdate||' '||a.op_name||' 운영 계획' as title, a.wrt_dt from operation_plan a - where ( - a.wrt_user_seq = #{userSeq} - or ( - a.op_state = 'DST002' and - ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' - from menu_mgt aa - left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} - where aa.menu_key = 32 ) - ) or ( - a.op_state = 'DST004' and - ( select ab.approval_auth ~ 'APC001' or ab.approval_auth ~ 'APC002' - from menu_mgt aa - left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} - where aa.menu_key = 32 + where + a.wrt_organ = #{ogCd} + and ( + a.wrt_user_seq = #{userSeq} + or ( + a.op_state = 'DST002' and + ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' + from menu_mgt aa + left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} + where aa.menu_key = 32 ) + ) or ( + a.op_state = 'DST004' and + ( select ab.approval_auth ~ 'APC001' or ab.approval_auth ~ 'APC002' + from menu_mgt aa + left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} + where aa.menu_key = 32 + ) ) ) - ) union all select 33 as board, a.affair_key as key, @@ -409,22 +415,24 @@ a.ia_sdate||'~'||a.ia_edate||' 운영 실적 분석' as title, a.wrt_dt from intelligence_analyze a - where ( - a.wrt_user_seq = #{userSeq} - or ( - a.ia_state = 'DST002' and - ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' - from menu_mgt aa - left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} - where aa.menu_key = 34 ) - ) or ( - a.ia_state = 'DST004' and - ( select ab.approval_auth ~ 'APC001' or ab.approval_auth ~ 'APC002' - from menu_mgt aa - left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} - where aa.menu_key = 34 ) + where + a.wrt_organ = #{ogCd} + and ( + a.wrt_user_seq = #{userSeq} + or ( + a.ia_state = 'DST002' and + ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' + from menu_mgt aa + left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} + where aa.menu_key = 34 ) + ) or ( + a.ia_state = 'DST004' and + ( select ab.approval_auth ~ 'APC001' or ab.approval_auth ~ 'APC002' + from menu_mgt aa + left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} + where aa.menu_key = 34 ) + ) ) - ) union all select 35 as board, a.fer_key as key, @@ -432,66 +440,72 @@ a.wrt_dt from fire_extension_report a inner join operation_plan b on a.op_key = b.op_key - where ( - a.wrt_user_seq = #{userSeq} - or ( - a.fer_state = 'DST002' and - ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' - from menu_mgt aa - left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} - where aa.menu_key = 35 ) - ) or ( - a.fer_state = 'DST004' and - ( select ab.approval_auth ~ 'APC001' or ab.approval_auth ~ 'APC002' - from menu_mgt aa - left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} - where aa.menu_key = 35 ) + where + a.wrt_organ = #{ogCd} + and ( + a.wrt_user_seq = #{userSeq} + or ( + a.fer_state = 'DST002' and + ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' + from menu_mgt aa + left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} + where aa.menu_key = 35 ) + ) or ( + a.fer_state = 'DST004' and + ( select ab.approval_auth ~ 'APC001' or ab.approval_auth ~ 'APC002' + from menu_mgt aa + left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} + where aa.menu_key = 35 ) + ) ) - ) union all select 36 as board, a.md_key as key, a.md_title as title, a.wrt_dt from monitoring_designation a - where ( - a.wrt_user_seq = #{userSeq} - or ( - a.md_state = 'DST002' and - ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' - from menu_mgt aa - left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} - where aa.menu_key = 36) - ) or ( - a.md_state = 'DST004' and - ( select ab.approval_auth ~ 'APC001' or ab.approval_auth ~ 'APC002' - from menu_mgt aa - left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} - where aa.menu_key = 36) + where + a.wrt_organ = #{ogCd} + and ( + a.wrt_user_seq = #{userSeq} + or ( + a.md_state = 'DST002' and + ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' + from menu_mgt aa + left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} + where aa.menu_key = 36) + ) or ( + a.md_state = 'DST004' and + ( select ab.approval_auth ~ 'APC001' or ab.approval_auth ~ 'APC002' + from menu_mgt aa + left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} + where aa.menu_key = 36) + ) ) - ) union all select 37 as board, a.mr_key as key, a.mr_title as title, a.wrt_dt from monitoring_result a - where ( - a.wrt_user_seq = #{userSeq} - or ( - a.mr_state = 'DST002' and - ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' - from menu_mgt aa - left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} - where aa.menu_key = 37) - ) or ( - a.mr_state = 'DST004' and - ( select ab.approval_auth ~ 'APC001' or ab.approval_auth ~ 'APC002' - from menu_mgt aa - left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} - where aa.menu_key = 37 ) + where + a.wrt_organ = #{ogCd} + and ( + a.wrt_user_seq = #{userSeq} + or ( + a.mr_state = 'DST002' and + ( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004' + from menu_mgt aa + left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} + where aa.menu_key = 37) + ) or ( + a.mr_state = 'DST004' and + ( select ab.approval_auth ~ 'APC001' or ab.approval_auth ~ 'APC002' + from menu_mgt aa + left outer join approval_config ab on aa.menu_key = ab.menu_key and ab.user_seq = #{userSeq} + where aa.menu_key = 37 ) + ) ) - ) union all select 12 as board, b.case_key as key, @@ -499,14 +513,16 @@ b.wrt_dt from activity_case a inner join activity_case_info b on a.receipt_key = b.receipt_key - where ( - a.wrt_user_seq = #{userSeq} - or b.case_key in ( - select case_key - from activity_case_apprv - where user_seq = #{userSeq} + where + a.wrt_organ = #{ogCd} + and ( + a.wrt_user_seq = #{userSeq} + or b.case_key in ( + select case_key + from activity_case_apprv + where user_seq = #{userSeq} + ) ) - ) order by wrt_dt desc limit 9 diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html index b890d119..ecec94ad 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html @@ -137,28 +137,30 @@
- -
-
-
- - - - + + + +
+
+ + + + +
+
+ +
+
+ +
-
- -
-
- -
-
- + +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html index a80f0a9d..bfdbc7f7 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html @@ -270,28 +270,30 @@
- -
-
-
- - - - + + + +
+
+ + + + +
+
+ +
+
+ +
-
- -
-
- -
-
- + +
diff --git a/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportViewModal.html b/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportViewModal.html index a40a7d6d..e124c6db 100644 --- a/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportViewModal.html +++ b/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportViewModal.html @@ -131,9 +131,11 @@
- - - + + + + + diff --git a/src/main/resources/templates/igActivities/intelligenceNetwork/intelligenceAnalyzeViewModal.html b/src/main/resources/templates/igActivities/intelligenceNetwork/intelligenceAnalyzeViewModal.html index c298e9d0..bbeb51d3 100644 --- a/src/main/resources/templates/igActivities/intelligenceNetwork/intelligenceAnalyzeViewModal.html +++ b/src/main/resources/templates/igActivities/intelligenceNetwork/intelligenceAnalyzeViewModal.html @@ -196,13 +196,11 @@
- - - + + + + + diff --git a/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanViewModal.html b/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanViewModal.html index 65fae2e9..7535a087 100644 --- a/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanViewModal.html +++ b/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanViewModal.html @@ -134,14 +134,14 @@
-
-
-
- - -
+ +
+
+ +
- +
+
@@ -153,9 +153,11 @@
- - - + + + + + diff --git a/src/main/resources/templates/igActivities/monitoring/designationViewModal.html b/src/main/resources/templates/igActivities/monitoring/designationViewModal.html index d95def1d..253400b7 100644 --- a/src/main/resources/templates/igActivities/monitoring/designationViewModal.html +++ b/src/main/resources/templates/igActivities/monitoring/designationViewModal.html @@ -21,13 +21,13 @@ - + - +
@@ -104,9 +104,9 @@
기타의견 : @@ -122,42 +122,46 @@
- -
-
-
-
- - - - -
-
- -
-
- -
+
+ + +
+ +
+
+ + + + +
+
+ +
+
+ +
+
+
- -
+ +
-
- - - +
+ + + + - -
-
- - - +
+
+ + + + - -
- +
+
\ No newline at end of file diff --git a/src/main/resources/templates/igActivities/monitoring/resultViewModal.html b/src/main/resources/templates/igActivities/monitoring/resultViewModal.html index c9ce2546..d01f0ab2 100644 --- a/src/main/resources/templates/igActivities/monitoring/resultViewModal.html +++ b/src/main/resources/templates/igActivities/monitoring/resultViewModal.html @@ -18,17 +18,17 @@
-
+
- + - +
@@ -60,10 +60,10 @@
-
-
지속
-
지정해제
-
+
+
지속
+
지정해제
+
@@ -75,44 +75,44 @@
-
- -
- - - - - - - - - - - - - - - - - - - -
구분상세금액
-
-
+
+ +
+ + + + + + + + + + + + + + + + + + + +
구분상세금액
+
- +
+
- + - +
@@ -135,30 +135,30 @@
- -
-
-
접촉 일시
-
접촉 내용
-
-
-
-
- -
-
-
-
-
-
-
+ +
+
+
접촉 일시
+
접촉 내용
+
+
+
+
+ +
+
+
-
- -
+
+
+
+
+
+
+
@@ -169,34 +169,34 @@
- -
- - - - - - - - - - - - - - - - - -
접촉일자작성일자제목첨부파일
- - - - 등록된 파일이 없습니다. -
-
-
+ +
+ + + + + + + + + + + + + + + + + +
접촉일자작성일자제목첨부파일
+ + + + 등록된 파일이 없습니다. +
+
+
증빙자료
@@ -233,57 +233,61 @@ - + - -
-
-
-
-
- - - - -
-
- -
-
- -
+
+ + +
+ +
+
+
+ + + + +
+
+ +
+
+ +
+
+
- -
+ +
-
- - - +
+ + + + - -
-
- - - +
+
+ + + + - -
- +
+
\ No newline at end of file