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 f2294b3c..cacc9de2 100644 --- a/src/main/java/com/dbnt/faisp/main/searchEngine/SearchEngineController.java +++ b/src/main/java/com/dbnt/faisp/main/searchEngine/SearchEngineController.java @@ -27,13 +27,14 @@ public class SearchEngineController { @GetMapping("/searchPage") public ModelAndView organMgtPage(@AuthenticationPrincipal UserInfo loginUser, SearchParams params) { ModelAndView mav = new ModelAndView("searchEngine/search"); + if(Utils.isEmpty(params.getKeyword())){ + mav.setViewName("common/keywordRequest"); + return mav; + } if (Utils.isEmpty(params.getActiveTab())){ params.setActiveTab("all"); params.setPageIndex(1); } -// if(Utils.isEmpty(params.getWrtOrgan())){ -// params.setWrtOrgan(codeMgtService.searchValue(loginUser.getOgCd())); -// } if(Utils.isEmpty(params.getWrtUserSeq())){ params.setWrtUserSeq(loginUser.getUserSeq()); } diff --git a/src/main/java/com/dbnt/faisp/main/searchEngine/model/SearchFileView.java b/src/main/java/com/dbnt/faisp/main/searchEngine/model/SearchFileView.java index caceb878..6c416c6e 100644 --- a/src/main/java/com/dbnt/faisp/main/searchEngine/model/SearchFileView.java +++ b/src/main/java/com/dbnt/faisp/main/searchEngine/model/SearchFileView.java @@ -16,4 +16,6 @@ public class SearchFileView { private String save_path; private String full_path; private String file_content; + private String wrt_organ; + private String wrt_user_seq; } diff --git a/src/main/java/com/dbnt/faisp/main/searchEngine/service/SearchEngineService.java b/src/main/java/com/dbnt/faisp/main/searchEngine/service/SearchEngineService.java index f434df93..815053ab 100644 --- a/src/main/java/com/dbnt/faisp/main/searchEngine/service/SearchEngineService.java +++ b/src/main/java/com/dbnt/faisp/main/searchEngine/service/SearchEngineService.java @@ -44,9 +44,6 @@ public class SearchEngineService { .append(params.getKeyword()) .append("' allword synonym"); if(!params.getForm().equals("search_menu_view.search_menu_view")){ -// builder.append(" and wrt_organ='") -// .append(params.getWrtOrgan()) -// .append("'"); builder.append(" and wrt_user_seq='") .append(params.getWrtUserSeq()) .append("'"); @@ -70,9 +67,8 @@ public class SearchEngineService { .queryParam("where", where) .queryParam("order by", " $relevance desc") .queryParam("offset", params.getOffset().toString()) - .queryParam("pagelength", params.getLimit().toString()) //.queryParam("limit", params.getLimit().toString()) - // total_count 갯수수가 limit로 제한걸려 조건에서 제외. 검색 결과는 정상적으로 나옴. + // total_count 갯수가 limit로 제한걸려 조건에서 제외. 검색 결과는 정상적으로 나옴. .queryParam("charset", "UTF-8") .queryParam("hilite-keywords", params.getKeyword()) .encode() diff --git a/src/main/resources/static/js/searchEngine/searchPage.js b/src/main/resources/static/js/searchEngine/searchPage.js index a4affb0a..e7c9cbc3 100644 --- a/src/main/resources/static/js/searchEngine/searchPage.js +++ b/src/main/resources/static/js/searchEngine/searchPage.js @@ -1,22 +1,28 @@  $(function () { - $('.searchFileBtn').click(function () { - if ($(this).parent('dd').hasClass('focus')) { - $(this).parent('dd').removeClass('focus'); - $(this).parent('dd').children('.searchFileList').slideUp(); - } else { - $(this).parent('dd').addClass('focus'); - $(this).parent('dd').children('.searchFileList').slideDown(); - } - }); - $('.searchPageBoxBtn').click(function () { - if ($('.searchPageBox').hasClass('searchDTView')) { - $('.searchPageBox').removeClass('searchDTView'); - } else { - $('.searchPageBox').addClass('searchDTView'); - } - }); + $('.searchFileBtn').click(function () { + if ($(this).parent('dd').hasClass('focus')) { + $(this).parent('dd').removeClass('focus'); + $(this).parent('dd').children('.searchFileList').slideUp(); + } else { + $(this).parent('dd').addClass('focus'); + $(this).parent('dd').children('.searchFileList').slideDown(); + } + }); + $('.searchPageBoxBtn').click(function () { + if ($('.searchPageBox').hasClass('searchDTView')) { + $('.searchPageBox').removeClass('searchDTView'); + } else { + $('.searchPageBox').addClass('searchDTView'); + } + }); + + $("#dateSelectorDiv").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); }); $(document).on('click', '#searchBtn', function (){ @@ -28,17 +34,19 @@ $(document).on('click', '.searchTabLink', function (){ searchPageFormSubmit(1); }) -$(document).on('click', '.boardLink', function (){ - let menuUrl = $(this).find(".menuUrl").val() - if(menuUrl === undefined){ - location.href= "/publicBoard/findPage?publicKey="+$(this).find(".refDocKey").val() - }else{ - if(menuUrl.includes("?")){ - menuUrl += "&refDocKey=" +$(document).on('click', '.boardLink', function (event){ + if(!event.target.className.includes('fileLink')){ + let menuUrl = $(this).find(".menuUrl").val() + if(menuUrl === undefined){ + location.href= "/publicBoard/findPage?publicKey="+$(this).find(".refDocKey").val() }else{ - menuUrl += "?refDocKey=" + if(menuUrl.includes("?")){ + menuUrl += "&refDocKey=" + }else{ + menuUrl += "?refDocKey=" + } + location.href = menuUrl+$(this).find(".refDocKey").val() } - location.href = menuUrl+$(this).find(".refDocKey").val() } }) diff --git a/src/main/resources/templates/common/keywordRequest.html b/src/main/resources/templates/common/keywordRequest.html new file mode 100644 index 00000000..122a29db --- /dev/null +++ b/src/main/resources/templates/common/keywordRequest.html @@ -0,0 +1,14 @@ + + + + + +
+
\ No newline at end of file diff --git a/src/main/resources/templates/searchEngine/search.html b/src/main/resources/templates/searchEngine/search.html index 56854801..1401594d 100644 --- a/src/main/resources/templates/searchEngine/search.html +++ b/src/main/resources/templates/searchEngine/search.html @@ -12,10 +12,10 @@
-
-
-
-
+ +
+
+
@@ -43,57 +43,57 @@
- -
-
-
-
-
-
- 상세검색 -
+ +
+
+ +
+ 상세검색 + -
- -
+ + + + + + +
@@ -222,10 +222,12 @@

첨부파일