From 661c2dd5da464d8350d6fab1259e67b7b4828e90 Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Fri, 27 Jan 2023 09:53:37 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix=20:=EC=99=B8=EC=82=AC=EC=88=98=EC=82=AC?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=EC=A1=B0=EA=B1=B4=EC=88=98=EC=A0=95=2094,?= =?UTF-8?q?95,96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boardInvestigation/IvsgtController.java | 3 +- .../majorStatus/MajorStatusController.java | 2 -- .../BoardInvestigationMapper.xml | 4 +++ .../mybatisMapper/MajorStatusMapper.xml | 6 ---- .../ivsgt/majorStatus/majorStatusPage.html | 30 ++++++------------- 5 files changed, 15 insertions(+), 30 deletions(-) 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/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 @@ - - + + + - - - - - - + + - + - + + - - - - - - - - - - - + From 60f0e2d2a27dde4b7c314cb3229e84fcd0b1224f Mon Sep 17 00:00:00 2001 From: "DESKTOP-QGC5RJO\\DBNT" Date: Fri, 27 Jan 2023 10:21:29 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=ED=83=80?= =?UTF-8?q?=EC=9D=B4=ED=8B=80=20=EB=84=A4=EB=AA=A8=20=EC=95=84=EC=9D=B4?= =?UTF-8?q?=EC=BD=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../faStatistics/crackdownStatus/crackdownStatus.html | 5 ++++- .../templates/faStatistics/fishingBoat/fishingBoatMgt.html | 5 ++++- .../internationalCrimeArrest/internationalCrimeArrest.html | 5 ++++- .../templates/faStatistics/processResult/processResult.html | 5 ++++- src/main/resources/templates/faStatistics/sailor/sailor.html | 5 ++++- .../igActivities/fpiMgt/affair/affairStatistics.html | 5 ++++- .../igActivities/fpiMgt/affairResult/resultMgt.html | 5 ++++- .../fpiMgt/intelligenceNetwork/fireExtensionReportList.html | 5 ++++- .../fpiMgt/intelligenceNetwork/operationPlanList.html | 5 ++++- src/main/resources/templates/sri/sriBoard.html | 5 ++++- 10 files changed, 40 insertions(+), 10 deletions(-) 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/sri/sriBoard.html b/src/main/resources/templates/sri/sriBoard.html index dd767632..06eb0949 100644 --- a/src/main/resources/templates/sri/sriBoard.html +++ b/src/main/resources/templates/sri/sriBoard.html @@ -11,7 +11,10 @@
-

SRI

+
+
+
SRI
+

첩보수집활동 > SRI

From 931e83e7179d5f16cd651bd309a3edb301e75fb7 Mon Sep 17 00:00:00 2001 From: "DESKTOP-QGC5RJO\\DBNT" Date: Fri, 27 Jan 2023 10:38:46 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EA=B3=B5=EB=AC=B4=EC=9B=90=20=EC=8B=9D?= =?UTF-8?q?=EB=B3=84=EB=B2=88=ED=98=B8=EB=A5=BC=20=EB=94=94=EC=A7=80?= =?UTF-8?q?=ED=84=B8=20=EC=8B=9D=EB=B3=84=EC=BD=94=EB=93=9C=EB=A1=9C=20?= =?UTF-8?q?=EB=AA=85=EC=B9=AD=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/login/login.js | 2 +- src/main/resources/static/js/police/police.js | 2 +- src/main/resources/static/js/userMgt/userMgt.js | 2 +- .../resources/templates/adminPage/userMgt/userEditModal.html | 4 ++-- src/main/resources/templates/login/joinForm.html | 4 ++-- src/main/resources/templates/login/login.html | 2 +- src/main/resources/templates/login/login_back.html | 2 +- .../resources/templates/police/police/policeEditModal.html | 4 ++-- src/main/resources/templates/police/police/policeHistory.html | 2 +- src/main/resources/templates/user/myInfo.html | 4 ++-- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/resources/static/js/login/login.js b/src/main/resources/static/js/login/login.js index 56ea2c53..9d797405 100644 --- a/src/main/resources/static/js/login/login.js +++ b/src/main/resources/static/js/login/login.js @@ -19,7 +19,7 @@ $(document).on('click', '#dicCodeSearchBtn', function (){ } }); }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/login/joinForm.html b/src/main/resources/templates/login/joinForm.html index 16326ce0..f0292989 100644 --- a/src/main/resources/templates/login/joinForm.html +++ b/src/main/resources/templates/login/joinForm.html @@ -7,7 +7,7 @@
- +
@@ -18,7 +18,7 @@
- +
diff --git a/src/main/resources/templates/login/login.html b/src/main/resources/templates/login/login.html index b2898f6d..0e97db05 100644 --- a/src/main/resources/templates/login/login.html +++ b/src/main/resources/templates/login/login.html @@ -64,7 +64,7 @@
- +
diff --git a/src/main/resources/templates/login/login_back.html b/src/main/resources/templates/login/login_back.html index 0cc6b6e0..4bd5942d 100644 --- a/src/main/resources/templates/login/login_back.html +++ b/src/main/resources/templates/login/login_back.html @@ -59,7 +59,7 @@
- +
diff --git a/src/main/resources/templates/police/police/policeEditModal.html b/src/main/resources/templates/police/police/policeEditModal.html index 5f363e13..d74039c1 100644 --- a/src/main/resources/templates/police/police/policeEditModal.html +++ b/src/main/resources/templates/police/police/policeEditModal.html @@ -20,7 +20,7 @@
- +
@@ -148,7 +148,7 @@ - +
diff --git a/src/main/resources/templates/police/police/policeHistory.html b/src/main/resources/templates/police/police/policeHistory.html index 5951a926..a3f7e6a8 100644 --- a/src/main/resources/templates/police/police/policeHistory.html +++ b/src/main/resources/templates/police/police/policeHistory.html @@ -52,7 +52,7 @@
- +
diff --git a/src/main/resources/templates/user/myInfo.html b/src/main/resources/templates/user/myInfo.html index 8e69b256..d06262a2 100644 --- a/src/main/resources/templates/user/myInfo.html +++ b/src/main/resources/templates/user/myInfo.html @@ -36,7 +36,7 @@
- +
@@ -44,7 +44,7 @@
- +
종류순번작성일시종류 제목관서부서계급작성자작성일시첨부파일내용첨부파일