From e09c34e7f0e23f59a3dd3129e4117a3184e0ba97 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 16 12월 2021 11:20:24 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/web/controller/ApiController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/controller/ApiController.java b/src/main/java/kr/wisestone/owl/web/controller/ApiController.java
index f056a56..e221753 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/ApiController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/ApiController.java
@@ -3,6 +3,7 @@
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.domain.Issue;
+import kr.wisestone.owl.domain.User;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.service.IssueService;
import kr.wisestone.owl.util.ConvertUtil;
@@ -18,6 +19,7 @@
import org.springframework.web.multipart.MultipartHttpServletRequest;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@Controller
@@ -42,7 +44,7 @@
@RequestMapping(value = "api/issue", method = RequestMethod.POST)
public
@ResponseBody
- Map<String, Object> addIssue(MultipartHttpServletRequest request) throws OwlRuntimeException {
+ Map<String, Object> addIssue(MultipartHttpServletRequest request) throws OwlRuntimeException, CloneNotSupportedException {
Map<String, Object> resJsonData = new HashMap<>();
IssueApiForm issueForm = IssueApiForm.make(ConvertUtil.convertJsonToMap(request.getParameter(Constants.REQ_KEY_CONTENT)), request.getFiles("file"));
@@ -50,9 +52,11 @@
throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_PARAMETER_ERROR));
}
if (issueForm.getApiType() == IssueApiForm.ApiType.add) {
- Issue issue = this.issueService.addApiIssue(issueForm);
+ List<Issue> issues = this.issueService.addApiIssue(issueForm);
// 踰꾩쟾 �깮�꽦
- this.issueService.addIssueVersion(issue.getId());
+ for (Issue issue : issues) {
+ this.issueService.addIssueVersion(issue.getId(), issue.getRegisterId());
+ }
} else {
this.issueService.modifyIssue(issueForm, request.getFiles("file"));
}
@@ -69,7 +73,6 @@
Pageable pageable = this.pageUtil.convertPageable(this.getPageVo(params));
// todo
-
return this.setSuccessMessage(resJsonData);
}
}
--
Gitblit v1.8.0