From 17ad96361a9dc63b9829eb4e5ae7962ca0e15372 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 금, 24 12월 2021 13:16:23 +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 | 8 +++++---
1 files changed, 5 insertions(+), 3 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 7033cf2..fb3a53a 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;
@@ -46,7 +47,9 @@
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"));
+ String str = request.getParameter(Constants.REQ_KEY_CONTENT);
+
+ IssueApiForm issueForm = IssueApiForm.make(ConvertUtil.convertJsonToMap(str), request.getFiles("file"));
if (issueForm == null) {
throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_PARAMETER_ERROR));
}
@@ -54,7 +57,7 @@
List<Issue> issues = this.issueService.addApiIssue(issueForm);
// 踰꾩쟾 �깮�꽦
for (Issue issue : issues) {
- this.issueService.addIssueVersion(issue.getId());
+ this.issueService.addIssueVersion(issue.getId(), issue.getRegisterId());
}
} else {
this.issueService.modifyIssue(issueForm, request.getFiles("file"));
@@ -72,7 +75,6 @@
Pageable pageable = this.pageUtil.convertPageable(this.getPageVo(params));
// todo
-
return this.setSuccessMessage(resJsonData);
}
}
--
Gitblit v1.8.0