From 47c5ce77b114324effdce5b3735ed0e661846108 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 목, 06 1월 2022 10:58:23 +0900 Subject: [PATCH] - 이슈 상세페이지 연관,하위 이슈 페이징 처리 --- src/main/java/kr/wisestone/owl/web/controller/IssueController.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java index 904cdc6..dd0da5f 100644 --- a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java +++ b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java @@ -126,7 +126,10 @@ @ResponseBody Map<String, Object> detail(@RequestBody Map<String, Map<String, Object>> params) { Map<String, Object> resJsonData = new HashMap<>(); - this.issueService.detailIssue(resJsonData, IssueCondition.make(params.get(Constants.REQ_KEY_CONTENT))); + Pageable relPageable = this.pageUtil.convertRelPageable(this.getPageVo(params)); + Pageable downPageable = this.pageUtil.convertDownPageable(this.getPageVo(params)); + + this.issueService.detailIssue(resJsonData, IssueCondition.make(params.get(Constants.REQ_KEY_CONTENT)), relPageable, downPageable); return this.setSuccessMessage(resJsonData); } @@ -218,7 +221,7 @@ public @ResponseBody Map<String, Object> importExcel(MultipartHttpServletRequest request) throws Exception { Map<String, Object> resJsonData = new HashMap<>(); - this.issueService.importExcel(request.getFile("file")); + this.issueService.importExcel(IssueForm.make(ConvertUtil.convertJsonToMap(request.getParameter(Constants.REQ_KEY_CONTENT))), request.getFile("file")); return this.setSuccessMessage(resJsonData); } -- Gitblit v1.8.0