From b2c5178aa79d8d30c438dd62705189021c90bc64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Tue, 20 Sep 2022 14:09:20 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B3=B5=EC=A7=80=EC=82=AC=ED=95=AD=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=9E=91=EC=97=85=EC=99=84?= =?UTF-8?q?=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dbnt/faisp/config/BaseController.java | 3 +- .../java/com/dbnt/faisp/config/BaseModel.java | 4 +- .../dbnt/faisp/fpiMgt/FpiMgtController.java | 12 ++--- .../organMgt/mapper/OrganConfigMapper.java | 3 +- .../organMgt/service/OrganConfigService.java | 9 +++- .../publicBoard/PublicBoardController.java | 17 ++++--- .../translator/TranslatorController.java | 4 +- .../mybatisMapper/MonthPlanMapper.xml | 4 +- .../mybatisMapper/OrganConfigMapper.xml | 19 ++++++- .../mybatisMapper/PublicBoardMapper.xml | 23 ++++++--- .../mybatisMapper/TranslatorMapper.xml | 6 +-- src/main/resources/static/js/common.js | 18 +++++++ .../js/igActivities/fpiMgt/monthPlan.js | 15 +----- .../static/js/publicBoard/publicBoard.js | 36 +++++++------ .../templates/publicBoard/commentDiv.html | 51 +++++++++++++++++++ .../publicBoard/notice/noticeViewModal.html | 14 ++--- 16 files changed, 167 insertions(+), 71 deletions(-) create mode 100644 src/main/resources/templates/publicBoard/commentDiv.html diff --git a/src/main/java/com/dbnt/faisp/config/BaseController.java b/src/main/java/com/dbnt/faisp/config/BaseController.java index cf1044fb..21e39686 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseController.java +++ b/src/main/java/com/dbnt/faisp/config/BaseController.java @@ -62,7 +62,8 @@ public class BaseController { } public void setSession(@AuthenticationPrincipal UserInfo loginUser, HttpSession session){ - loginUser.setOrganCdList(organConfigService.selectOrganListWhereUserOgCd(loginUser.getOgCd())); + loginUser.setDownOrganCdList(organConfigService.selectDownOrganListWhereUserOgCd(loginUser.getOgCd())); + loginUser.setUpOrganCdList(organConfigService.selectUpOrganListWhereUserOgCd(loginUser.getOgCd())); session.setAttribute("menuList", menuMgtService.selectAccessMenuListWhereUserSeq(loginUser.getUserSeq())); session.setAttribute("commonCode", codeMgtService.getCommonCode()); } diff --git a/src/main/java/com/dbnt/faisp/config/BaseModel.java b/src/main/java/com/dbnt/faisp/config/BaseModel.java index e4192fbc..5a52a6e9 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseModel.java +++ b/src/main/java/com/dbnt/faisp/config/BaseModel.java @@ -12,7 +12,9 @@ import java.util.List; @NoArgsConstructor public class BaseModel { @Transient - private List organCdList; + private List upOrganCdList; + @Transient + private List downOrganCdList; @Transient private Integer pageIndex=1; //요청페이지 @Transient diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/FpiMgtController.java b/src/main/java/com/dbnt/faisp/fpiMgt/FpiMgtController.java index 0245e717..1b585c3f 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/FpiMgtController.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/FpiMgtController.java @@ -37,8 +37,8 @@ public class FpiMgtController { // 외사경찰견문관리 planBoard.setWrtUserSeq(loginUser.getUserSeq()); break; case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능 - planBoard.setOrganCdList(loginUser.getOrganCdList()); - mav.addObject("mgtOrganList", loginUser.getOrganCdList()); + planBoard.setDownOrganCdList(loginUser.getDownOrganCdList()); + mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); break; } //결재권한 확인 @@ -108,8 +108,8 @@ public class FpiMgtController { // 외사경찰견문관리 planBoard.setWrtOrgan(loginUser.getOgCd()); break; case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능 - planBoard.setOrganCdList(loginUser.getOrganCdList()); - mav.addObject("mgtOrganList", loginUser.getOrganCdList()); + planBoard.setDownOrganCdList(loginUser.getDownOrganCdList()); + mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); break; } //결재권한 확인 @@ -166,8 +166,8 @@ public class FpiMgtController { // 외사경찰견문관리 planBoard.setWrtOrgan(loginUser.getOgCd()); break; case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능 - planBoard.setOrganCdList(loginUser.getOrganCdList()); - mav.addObject("mgtOrganList", loginUser.getOrganCdList()); + planBoard.setDownOrganCdList(loginUser.getDownOrganCdList()); + mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); break; } //결재권한 확인 diff --git a/src/main/java/com/dbnt/faisp/organMgt/mapper/OrganConfigMapper.java b/src/main/java/com/dbnt/faisp/organMgt/mapper/OrganConfigMapper.java index a1546548..d838e488 100644 --- a/src/main/java/com/dbnt/faisp/organMgt/mapper/OrganConfigMapper.java +++ b/src/main/java/com/dbnt/faisp/organMgt/mapper/OrganConfigMapper.java @@ -7,5 +7,6 @@ import java.util.List; @Mapper public interface OrganConfigMapper { - List selectOrganListWhereUserOgCd(String ogCd); + List selectDownOrganListWhereUserOgCd(String ogCd); + List selectUpOrganListWhereUserOgCd(String ogCd); } diff --git a/src/main/java/com/dbnt/faisp/organMgt/service/OrganConfigService.java b/src/main/java/com/dbnt/faisp/organMgt/service/OrganConfigService.java index fcfcf4d8..92145de7 100644 --- a/src/main/java/com/dbnt/faisp/organMgt/service/OrganConfigService.java +++ b/src/main/java/com/dbnt/faisp/organMgt/service/OrganConfigService.java @@ -24,7 +24,12 @@ public class OrganConfigService { return organConfigRepository.saveAll(organConfigList).size(); } - public List selectOrganListWhereUserOgCd(String ogCd) { - return organConfigMapper.selectOrganListWhereUserOgCd(ogCd); + public List selectDownOrganListWhereUserOgCd(String ogCd) { + return organConfigMapper.selectDownOrganListWhereUserOgCd(ogCd); + } + public List selectUpOrganListWhereUserOgCd(String ogCd) { + List upOrganList = organConfigMapper.selectUpOrganListWhereUserOgCd(ogCd); + upOrganList.add(ogCd); + return upOrganList; } } diff --git a/src/main/java/com/dbnt/faisp/publicBoard/PublicBoardController.java b/src/main/java/com/dbnt/faisp/publicBoard/PublicBoardController.java index d9a4a71a..3b4f0d7f 100644 --- a/src/main/java/com/dbnt/faisp/publicBoard/PublicBoardController.java +++ b/src/main/java/com/dbnt/faisp/publicBoard/PublicBoardController.java @@ -27,9 +27,10 @@ public class PublicBoardController { publicBoard.setQueryInfo(); publicBoard.setPublicType("PLB001"); if(loginUser.getUserRole().contains(Role.SUB_ADMIN.getValue())){ - publicBoard.setOrganCdList(loginUser.getOrganCdList()); - mav.addObject("mgtOrganList", loginUser.getOrganCdList()); + publicBoard.setDownOrganCdList(loginUser.getDownOrganCdList()); + mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); } + publicBoard.setUpOrganCdList(loginUser.getUpOrganCdList()); mav.addObject("noticeList", publicBoardService.selectContentList(publicBoard)); publicBoard.setContentCnt(publicBoardService.selectContentListCnt(publicBoard)); publicBoard.setPaginationInfo(); @@ -94,18 +95,22 @@ public class PublicBoardController { return publicBoardService.saveContent(publicBoard, deleteFileSeq); } @PostMapping("/saveComment") - public Integer saveComment(@AuthenticationPrincipal UserInfo loginUser, PublicComment comment){ + public ModelAndView saveComment(@AuthenticationPrincipal UserInfo loginUser, PublicComment comment){ comment.setWrtOrgan(loginUser.getOgCd()); comment.setWrtPart(loginUser.getOfcCd()); comment.setWrtUserSeq(loginUser.getUserSeq()); comment.setWrtUserNm(loginUser.getUserNm()); comment.setWrtDt(LocalDateTime.now()); - return publicBoardService.saveComment(comment); + publicBoardService.saveComment(comment); + ModelAndView mav = new ModelAndView("publicBoard/commentDiv"); + mav.addObject("comment", comment); + mav.addObject("userSeq", loginUser.getUserSeq()); + return mav; } @PostMapping("/deleteComment") @ResponseBody - public void deleteComment(Integer publicKey, Integer commentKey){ - publicBoardService.deleteComment(publicKey, commentKey); + public void deleteComment(@RequestBody PublicComment comment){ + publicBoardService.deleteComment(comment.getPublicKey(), comment.getCommentKey()); } } diff --git a/src/main/java/com/dbnt/faisp/translator/TranslatorController.java b/src/main/java/com/dbnt/faisp/translator/TranslatorController.java index 2a972775..e1daef67 100644 --- a/src/main/java/com/dbnt/faisp/translator/TranslatorController.java +++ b/src/main/java/com/dbnt/faisp/translator/TranslatorController.java @@ -39,7 +39,7 @@ public class TranslatorController { Map params = new HashMap<>(); params.put("userSeq", loginUser.getUserSeq()); params.put("menuUrl", "/translator/info"); - translator.setOrganCdList(organConfigService.selectOrganListWhereUserOgCd(loginUser.getOgCd())); + translator.setDownOrganCdList(loginUser.getDownOrganCdList()); //엑셀다운 if(translator.getExcel() != null && translator.getExcel().equals("Y")){ String[] headers = { "translator_key", "ogdp1", "tr_lang", "tr_career", "tr_name", "tr_age", "tr_nny", "tr_edu", "tr_cft", "dml_yn", "apt_dt", "tr_phone"}; @@ -59,7 +59,7 @@ public class TranslatorController { //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(params).get(0).getAccessAuth(); - mav.addObject("mgtOrganList", loginUser.getOrganCdList()); + mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); mav.addObject("accessAuth", accessAuth); translator.setQueryInfo(); mav.addObject("translatorList", translatorSevice.selectTranslatorList(translator)); diff --git a/src/main/resources/mybatisMapper/MonthPlanMapper.xml b/src/main/resources/mybatisMapper/MonthPlanMapper.xml index ed6c344c..5899f32e 100644 --- a/src/main/resources/mybatisMapper/MonthPlanMapper.xml +++ b/src/main/resources/mybatisMapper/MonthPlanMapper.xml @@ -37,9 +37,9 @@ and a.wrt_dt <= #{endDate}::date - + and a.wrt_organ in - + #{organCd} diff --git a/src/main/resources/mybatisMapper/OrganConfigMapper.xml b/src/main/resources/mybatisMapper/OrganConfigMapper.xml index 537ae800..220a26ba 100644 --- a/src/main/resources/mybatisMapper/OrganConfigMapper.xml +++ b/src/main/resources/mybatisMapper/OrganConfigMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - with recursive organ_list ( organ_cd ) as( @@ -20,5 +20,22 @@ ) select * from organ_list + \ No newline at end of file diff --git a/src/main/resources/mybatisMapper/PublicBoardMapper.xml b/src/main/resources/mybatisMapper/PublicBoardMapper.xml index 9f03e872..899b8ddf 100644 --- a/src/main/resources/mybatisMapper/PublicBoardMapper.xml +++ b/src/main/resources/mybatisMapper/PublicBoardMapper.xml @@ -15,12 +15,23 @@ and a.wrt_dt <= #{endDate}::date - - and a.wrt_organ in - - #{organCd} - - + and a.public_key in ( + + select public_key from public_board where wrt_organ in + + #{organCd} + + + + union all + + + select public_key from public_board where organ_chk = 'F' and wrt_organ in + + #{organCd} + + + ) + + +
+ + +
+ +
+
+
+ +
+
+ +
+
+ +
+ + + +
+
+ +
+
+
+ + + +
+ + +
+ +
+
+
+ +
+
+
+
+
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/publicBoard/notice/noticeViewModal.html b/src/main/resources/templates/publicBoard/notice/noticeViewModal.html index 2a153caf..5f84c513 100644 --- a/src/main/resources/templates/publicBoard/notice/noticeViewModal.html +++ b/src/main/resources/templates/publicBoard/notice/noticeViewModal.html @@ -67,7 +67,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
@@ -89,7 +89,7 @@
- +
@@ -111,17 +111,17 @@
- - + +
- +
-
+