diff --git a/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java b/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java index 8532d6a..4344193 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java +++ b/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java @@ -48,7 +48,7 @@ public class BoardController { } @GetMapping("/contentWrite") - public ModelAndView contentWrite(@AuthenticationPrincipal UserInfo loginUser, Board content) { + public ModelAndView contentWrite(@AuthenticationPrincipal UserInfo loginUser, Board content, Integer categorySeq) { ModelAndView mav = new ModelAndView("board/contentWrite"); if(content.getContentSeq() == null) { mav.addObject("type", "new"); @@ -58,7 +58,7 @@ public class BoardController { mav.addObject("type", "modify"); mav.addObject("content", boardService.selectContentModifyInfo(content.getContentSeq())); } - + mav.addObject("categorySeq", categorySeq); mav.addObject("userRole", loginUser.getUserRole()); CategoryRole categoryRole = new CategoryRole(); categoryRole.setUserSeq(loginUser.getUserSeq()); diff --git a/src/main/resources/mybatisMapper/BoardMapper.xml b/src/main/resources/mybatisMapper/BoardMapper.xml index a622d7f..ca0bdc5 100644 --- a/src/main/resources/mybatisMapper/BoardMapper.xml +++ b/src/main/resources/mybatisMapper/BoardMapper.xml @@ -27,7 +27,7 @@ INNER JOIN CONTENT_POSITION D ON A.CATEGORY_SEQ = D.CATEGORY_SEQ - + WHERE A.STATUS != 'D' AND A.STATUS = #{status} @@ -71,7 +71,6 @@ WHERE ORIGINAL_NAME LIKE CONCAT('%', #{originalName}, '%') ) - ORDER BY A.VIEW_CNT DESC @@ -96,7 +95,7 @@ INNER JOIN CONTENT_POSITION D ON A.CATEGORY_SEQ = D.CATEGORY_SEQ - + WHERE A.STATUS != 'D' AND A.STATUS = #{status} @@ -140,7 +139,6 @@ WHERE ORIGINAL_NAME LIKE CONCAT('%', #{originalName}, '%') ) -