diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java index b3145387..499c795d 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java @@ -33,7 +33,8 @@ public class IvsgtController { mav.addObject("accessAuth", accessAuth); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); - + + boardInvestigation.setDownOrganCdList(loginUser.getDownOrganCdList()); boardInvestigation.setQueryInfo(); mav.addObject("boardInvestigationList", boardInvestigationService.selectBoardInvestigationList(boardInvestigation)); boardInvestigation.setContentCnt(boardInvestigationService.selectBoardInvestigationListCnt(boardInvestigation)); diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java index 86924985..b1e6c4ef 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java @@ -40,9 +40,7 @@ public class MajorStatusController { mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); mav.addObject("searchParams", majorStatus); - majorStatus.setDownOrganCdList(loginUser.getDownOrganCdList()); majorStatus.setQueryInfo(); - mav.addObject("majorList", majorStatusService.selectMajorList(majorStatus)); majorStatus.setContentCnt(majorStatusService.selectMajorListCnt(majorStatus)); majorStatus.setPaginationInfo(); diff --git a/src/main/resources/mybatisMapper/BoardInvestigationMapper.xml b/src/main/resources/mybatisMapper/BoardInvestigationMapper.xml index 5a4d7a29..38925f88 100644 --- a/src/main/resources/mybatisMapper/BoardInvestigationMapper.xml +++ b/src/main/resources/mybatisMapper/BoardInvestigationMapper.xml @@ -6,6 +6,10 @@ + and a.wrt_organ in + + #{organCd} + AND ivsgt_type = #{ivsgtType} diff --git a/src/main/resources/mybatisMapper/MajorStatusMapper.xml b/src/main/resources/mybatisMapper/MajorStatusMapper.xml index bb24d6f1..4df82611 100644 --- a/src/main/resources/mybatisMapper/MajorStatusMapper.xml +++ b/src/main/resources/mybatisMapper/MajorStatusMapper.xml @@ -26,12 +26,6 @@ and a.wrt_dt <= #{endDate}::date+1 - - and a.wrt_organ in - - #{organCd} - - diff --git a/src/main/resources/static/js/login/login.js b/src/main/resources/static/js/login/login.js index 6c008bf6..9b8446ff 100644 --- a/src/main/resources/static/js/login/login.js +++ b/src/main/resources/static/js/login/login.js @@ -8,7 +8,7 @@ $(document).on('click', '#dicCodeSearchBtn', function (){ if(dicCode!==''){ getJoinForm(dicCode); }else{ - alert("공무원식별번호를 입력해주세요.") + alert("디지털식별코드를 입력해주세요.") } }) diff --git a/src/main/resources/static/js/police/police.js b/src/main/resources/static/js/police/police.js index 09f04f90..b6769a55 100644 --- a/src/main/resources/static/js/police/police.js +++ b/src/main/resources/static/js/police/police.js @@ -30,7 +30,7 @@ function showModal(userSeq){ $(document).on('click', '#syncToKwmsBtn', function (){ const dicCode = $("#dicCode").val(); if(!dicCode){ - alert("공무원식별번호가 없습니다.") + alert("디지털식별코드가 없습니다.") }else{ syncUserInfoToKwms([{ userSeq: $("#userSeq").val(), diff --git a/src/main/resources/static/js/userMgt/userMgt.js b/src/main/resources/static/js/userMgt/userMgt.js index 626ee1fc..7a9b4a1c 100644 --- a/src/main/resources/static/js/userMgt/userMgt.js +++ b/src/main/resources/static/js/userMgt/userMgt.js @@ -58,7 +58,7 @@ $(document).on('click', '#deleteBtn', function (){ $(document).on('click', '#syncToKwmsBtn', function (){ const dicCode = $("#dicCode").val(); if(!dicCode){ - alert("공무원식별번호가 없습니다.") + alert("디지털식별코드가 없습니다.") }else{ syncUserInfoToKwms([{ userSeq: $("#userSeq").val(), diff --git a/src/main/resources/templates/adminPage/userMgt/userEditModal.html b/src/main/resources/templates/adminPage/userMgt/userEditModal.html index 02a90e03..ba8305c0 100644 --- a/src/main/resources/templates/adminPage/userMgt/userEditModal.html +++ b/src/main/resources/templates/adminPage/userMgt/userEditModal.html @@ -28,7 +28,7 @@
- +
@@ -171,7 +171,7 @@ - +
diff --git a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html index 03083bd9..784dd8ac 100644 --- a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html +++ b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html @@ -14,7 +14,10 @@
-

불법조업 외국어선 단속현황

+
+
+
불법조업 외국어선 단속현황
+

외사통계 > 불법조업외국어선 > 불법조업 외국어선 단속현황

diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html index e7e41b10..d39cd553 100644 --- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html +++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html @@ -19,7 +19,10 @@
-

불법조업 외국어선 정보

+
+
+
불법조업 외국어선 정보
+

외사통계 > 불법조업외국어선 > 불법조업 외국어선 정보

diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html index 0184f126..da6431c6 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html @@ -16,7 +16,10 @@
-

국제범죄 검거현황

+
+
+
국제범죄 검거현황
+

외사통계 > 국제범죄검거현황

diff --git a/src/main/resources/templates/faStatistics/processResult/processResult.html b/src/main/resources/templates/faStatistics/processResult/processResult.html index 54d3978d..d76887e0 100644 --- a/src/main/resources/templates/faStatistics/processResult/processResult.html +++ b/src/main/resources/templates/faStatistics/processResult/processResult.html @@ -13,7 +13,10 @@
-

불법조업 외국어선 처리현황

+
+
+
불법조업 외국어선 처리현황
+

외사통계 > 불법조업 외국어선 > 불법조업 외국어선 처리현황

diff --git a/src/main/resources/templates/faStatistics/sailor/sailor.html b/src/main/resources/templates/faStatistics/sailor/sailor.html index 4c64cf92..78c23e56 100644 --- a/src/main/resources/templates/faStatistics/sailor/sailor.html +++ b/src/main/resources/templates/faStatistics/sailor/sailor.html @@ -13,7 +13,10 @@
-

선원 세부 현황

+
+
+
선원 세부 현황
+

외사통계 > 불법조업 외국어선 > 선원 세부 현황

diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairStatistics.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairStatistics.html index 02bdfa32..a28d913a 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairStatistics.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairStatistics.html @@ -13,7 +13,10 @@
-

견문통계

+
+
+
견문통계
+

첩보수집활동 > 견문통계

diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html index 102b5ce9..bc4916b2 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html @@ -10,7 +10,10 @@
-

청산보고서

+
+
+
청산보고서
+

첩보수집활동 > 외사경찰 견문관리 > 청산보고서

diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportList.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportList.html index a699b59c..c8a00e13 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportList.html +++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportList.html @@ -10,7 +10,10 @@
-

외사첩보망 해고(연장) 보고

+
+
+
외사첩보망 해고(연장) 보고
+

첩보수집활동 > 외사첩보망 견문관리 > 외사첩보망 해고(연장) 보고

diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html index 1f55902c..da110534 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html +++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html @@ -10,7 +10,10 @@
-

운영계획서

+
+
+
운영계획서
+

첩보수집활동 > 외사첩보망 견문관리 > 운영계획

diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html index 4c782144..b0260759 100644 --- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html +++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html @@ -67,36 +67,24 @@ - - + + + - - - - - - + + - + - + + - - - - - - - - - - - + diff --git a/src/main/resources/templates/login/joinForm.html b/src/main/resources/templates/login/joinForm.html index ebcd9e39..3313b7a1 100644 --- a/src/main/resources/templates/login/joinForm.html +++ b/src/main/resources/templates/login/joinForm.html @@ -7,7 +7,7 @@
종류순번작성일시종류 제목관서부서계급작성자작성일시첨부파일내용첨부파일