diff --git a/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java b/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java index ec0a9cd..efe386c 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java +++ b/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java @@ -38,7 +38,7 @@ public class BoardController { @GetMapping("/contentWrite") public ModelAndView contentWrite(@AuthenticationPrincipal UserInfo loginUser, Board content) { ModelAndView mav = new ModelAndView("board/contentWrite"); - if(content == null) { + if(content.getContentSeq() == null) { mav.addObject("type", "new"); mav.addObject("userId", loginUser.getUserId()); mav.addObject("userName", loginUser.getName()); @@ -94,6 +94,13 @@ public class BoardController { return boardService.deleteContent(content, loginUser); } + @GetMapping("/contentSearch") + public ModelAndView contentSearch(Board content){ + ModelAndView mav = new ModelAndView("board/contentSearch"); + mav.addObject("searchParams", content); + return mav; + } + @GetMapping("/fileDownload") public void fileDownload(Principal principal, Integer contentSeq, Integer fileSeq, HttpServletRequest request, HttpServletResponse response){ FileInfo downlodFileInfo = boardService.selectDownloadFileInfo(contentSeq, fileSeq, ((UserInfo)((UsernamePasswordAuthenticationToken) principal).getPrincipal()).getUserId()); diff --git a/src/main/resources/templates/board/contentSearch.html b/src/main/resources/templates/board/contentSearch.html new file mode 100644 index 0000000..b8087c4 --- /dev/null +++ b/src/main/resources/templates/board/contentSearch.html @@ -0,0 +1,152 @@ + + + + + +
+
+

통합 검색

+
+
+
+
+
+ +
+ +
+
+
+ +
+
+ +
+
+
+
+
+ + +
+
+ + +
+ +
+ +
+
+
+
+
+
+ + + + + + + + + + + + + + + +
아이디이름부서직급생성일상태
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+

왼쪽 목록에서 선택해주세요.

+
+
+
+
+
+
+
+
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/fragments/leftMenu.html b/src/main/resources/templates/fragments/leftMenu.html index c194ad0..b8d0689 100644 --- a/src/main/resources/templates/fragments/leftMenu.html +++ b/src/main/resources/templates/fragments/leftMenu.html @@ -13,7 +13,7 @@
- + 통합 검색
자료 등록 diff --git a/src/main/resources/templates/admin/defaultContentLayout.html b/src/main/resources/templates/layout/defaultContentLayout.html similarity index 98% rename from src/main/resources/templates/admin/defaultContentLayout.html rename to src/main/resources/templates/layout/defaultContentLayout.html index 89c531c..9c25b5e 100644 --- a/src/main/resources/templates/admin/defaultContentLayout.html +++ b/src/main/resources/templates/layout/defaultContentLayout.html @@ -5,7 +5,7 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> - +