From 12ee57fe168d76d8a71993a1473dba8b20d49ab9 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 29 11월 2021 09:43:53 +0900
Subject: [PATCH] 이슈(추가,수정)충돌 수정
---
src/main/java/kr/wisestone/owl/web/controller/IssueTableConfigController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/controller/IssueTableConfigController.java b/src/main/java/kr/wisestone/owl/web/controller/IssueTableConfigController.java
index 638d2a2..8fa676f 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/IssueTableConfigController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/IssueTableConfigController.java
@@ -61,9 +61,10 @@
@RequestMapping(value = "/issueTableConfig/detail", produces = MediaType.APPLICATION_JSON_VALUE)
public
@ResponseBody
- Map<String, Object> detail() {
+ Map<String, Object> detail(@RequestBody Map<String, Map<String, Object>> params) {
Map<String, Object> resJsonData = new HashMap<>();
- this.issueTableConfigService.detailIssueTableConfig(resJsonData);
+
+ this.issueTableConfigService.detailIssueTableConfig(params.get(Constants.REQ_KEY_CONTENT), resJsonData);
return this.setSuccessMessage(resJsonData);
}
@@ -72,9 +73,9 @@
@RequestMapping(value = "/issueTableConfig/relationDetail", produces = MediaType.APPLICATION_JSON_VALUE)
public
@ResponseBody
- Map<String, Object> relationDetail(@RequestBody Map<String, Object> params) {
+ Map<String, Object> relationDetail(@RequestBody Map<String, Map<String, Object>> params) {
Map<String, Object> resJsonData = new HashMap<>();
- this.issueTableConfigService.detailRelationIssueTableConfig(params,resJsonData);
+ this.issueTableConfigService.detailRelationIssueTableConfig(params.get(Constants.REQ_KEY_CONTENT), resJsonData);
return this.setSuccessMessage(resJsonData);
}
@@ -83,9 +84,9 @@
@RequestMapping(value = "/issueTableConfig/downDetail", produces = MediaType.APPLICATION_JSON_VALUE)
public
@ResponseBody
- Map<String, Object> downDetail(@RequestBody Map<String, Object> params) {
+ Map<String, Object> downDetail(@RequestBody Map<String, Map<String, Object>> params) {
Map<String, Object> resJsonData = new HashMap<>();
- this.issueTableConfigService.detailDownIssueTableConfig(params,resJsonData);
+ this.issueTableConfigService.detailDownIssueTableConfig(params.get(Constants.REQ_KEY_CONTENT),resJsonData);
return this.setSuccessMessage(resJsonData);
}
--
Gitblit v1.8.0