diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java index e3a5e73e..2fb582f2 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java @@ -196,8 +196,7 @@ public class AffairService extends BaseService { // 견문보고 savedRating.setAffairStatus(rating.getHeadApprv()); if(rating.getHeadApprv().equals("DST006")){ AffairBoard affairBoard = affairBoardRepository.findById(savedRating.getAffairKey()).orElse(null); - if(Utils.isEmpty(affairBoard.getDocNo()) - && affairBoard.getWrtOrgan().equals(savedRating.getRatingOrgan())){ + if(Utils.isEmpty(affairBoard.getDocNo()) ){/*&& affairBoard.getWrtOrgan().equals(savedRating.getRatingOrgan())*/ affairBoard.setDocNo(makeDocNo(affairBoard.getWrtOrgan(), affairBoard.getReportDt().getYear(), i)); } i++; @@ -291,8 +290,7 @@ public class AffairService extends BaseService { // 견문보고 rating.setAffairStatus(rating.getHeadApprv()); if(rating.getHeadApprv().equals("DST006")){ AffairBoard affairBoard = affairBoardRepository.findById(rating.getAffairKey()).orElse(null); - if(affairBoard.getDocNo() == null - && affairBoard.getWrtOrgan().equals(rating.getRatingOrgan())){ + if(affairBoard.getDocNo() == null ){/*&& affairBoard.getWrtOrgan().equals(rating.getRatingOrgan())*/ affairBoard.setDocNo(makeDocNo(affairBoard.getWrtOrgan(), affairBoard.getReportDt().getYear(), 0)); } } diff --git a/src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java b/src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java index 35bf12c7..75a47cdc 100644 --- a/src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java +++ b/src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java @@ -25,7 +25,7 @@ public class PublicBoardController { @GetMapping("/findPage") public ModelAndView findPublicBoardPage(@AuthenticationPrincipal UserInfo loginUser, PublicBoard publicBoard){ - publicBoard = publicBoardService.selectPublicBoard(publicBoard.getPublicKey()); + publicBoard = publicBoardService.selectPublicBoard(publicBoard.getRefDocKey()); ModelAndView mav = new ModelAndView(); switch (publicBoard.getPublicType()){ case "PLB001": diff --git a/src/main/java/com/dbnt/faisp/main/searchEngine/SearchEngineController.java b/src/main/java/com/dbnt/faisp/main/searchEngine/SearchEngineController.java index 3c67130d..e6abe9e6 100644 --- a/src/main/java/com/dbnt/faisp/main/searchEngine/SearchEngineController.java +++ b/src/main/java/com/dbnt/faisp/main/searchEngine/SearchEngineController.java @@ -29,6 +29,8 @@ public class SearchEngineController { public ModelAndView searchPage(@AuthenticationPrincipal UserInfo loginUser, SearchParams params) { ModelAndView mav = new ModelAndView("searchEngine/searchPage"); mav.addObject("accessMenuList", menuMgtService.selectAccessMenuList(loginUser.getUserSeq())); + mav.addObject("userOrgan", loginUser.getOgCd()); + mav.addObject("userSeq", loginUser.getUserSeq()); mav.addObject("downOrganList", loginUser.getDownOrganCdList()); if(Utils.isEmpty(params.getKeyword())){ mav.setViewName("common/keywordRequest"); diff --git a/src/main/resources/mybatisMapper/AffairMapper.xml b/src/main/resources/mybatisMapper/AffairMapper.xml index 4036586d..9e443299 100644 --- a/src/main/resources/mybatisMapper/AffairMapper.xml +++ b/src/main/resources/mybatisMapper/AffairMapper.xml @@ -153,7 +153,7 @@ select count(*)+1 as cnt from affair_board a inner join affair_rating b - on a.affair_key = b.affair_key and a.wrt_organ = b.rating_organ and b.affair_status = 'DST006' + on a.affair_key = b.affair_key and b.affair_status = 'DST006' --and a.wrt_organ = b.rating_organ where wrt_organ = #{wrtOrgan} and a.doc_no is not null and EXTRACT(YEAR FROM report_dt) = #{year}::numeric diff --git a/src/main/resources/static/js/searchEngine/searchPage.js b/src/main/resources/static/js/searchEngine/searchPage.js index dc047ab0..7c73364b 100644 --- a/src/main/resources/static/js/searchEngine/searchPage.js +++ b/src/main/resources/static/js/searchEngine/searchPage.js @@ -79,18 +79,14 @@ $(document).on('click', '.boardLink', function (event){ const menuUrlEl = $(this).find(".menuUrl"); if(menuUrlEl.length !== 0){ let menuUrl = menuUrlEl.val() - if(menuUrl === undefined){ - location.href = "/publicBoard/findPage?publicKey="+$(this).find(".refDocKey").val() + if(menuUrl.includes("?")){ + menuUrl += "&refDocKey=" }else{ - if(menuUrl.includes("?")){ - menuUrl += "&refDocKey=" - }else{ - menuUrl += "?refDocKey=" - } - location.href = menuUrl+$(this).find(".refDocKey").val() + menuUrl += "?refDocKey=" } + location.href = menuUrl+$(this).find(".refDocKey").val() }else{ - alert("메뉴 접근 권한이 없습니다.") + alert("게시물 접근 권한이 없습니다.") } } }) diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html index 196b73f5..f0be3427 100644 --- a/src/main/resources/templates/fragments/header.html +++ b/src/main/resources/templates/fragments/header.html @@ -66,7 +66,7 @@
- +
diff --git a/src/main/resources/templates/searchEngine/searchPage.html b/src/main/resources/templates/searchEngine/searchPage.html index fc19d81b..af81d4f3 100644 --- a/src/main/resources/templates/searchEngine/searchPage.html +++ b/src/main/resources/templates/searchEngine/searchPage.html @@ -153,15 +153,47 @@
  • 메시지