From 392f3bae3fba9de4a366e81c201bfa7d7055ff3b Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 26 11월 2021 11:00:48 +0900
Subject: [PATCH] 이슈 히스토리 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java | 6 +++---
src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java | 6 ------
src/main/webapp/scripts/app/issue/issueModify.controller.js | 6 +++---
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
index cef768e..615b48b 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
@@ -483,7 +483,7 @@
// �뾽泥� �젙蹂� 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
@Override
public void detectIssueCompany(IssueHistoryType type, Map<String, Object> param, IssueCompany issueCompany, StringBuilder description) {
- Long id = MapUtil.getLong(param, "id");
+ Long id = MapUtil.getLong(param, "companyId");
Long companyFieldId = issueCompany.getCompanyField().getId();
if (type == IssueHistoryType.ADD) { //異붽� �븷 寃쎌슦
@@ -519,7 +519,7 @@
// ISP �젙蹂� 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
@Override
public void detectIssueIsp(IssueHistoryType type, Map<String, Object> param, IssueIsp issueIsp, StringBuilder description) {
- Long id = MapUtil.getLong(param, "id");
+ Long id = MapUtil.getLong(param, "companyId");
Long ispFieldId = issueIsp.getIspField().getId();
if (type == IssueHistoryType.ADD) {
@@ -555,7 +555,7 @@
// �샇�뒪�똿 �젙蹂� 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
@Override
public void detectIssueHosting(IssueHistoryType type, Map<String, Object> param, IssueHosting issueHosting, StringBuilder description) {
- Long id = MapUtil.getLong(param, "id");
+ Long id = MapUtil.getLong(param, "companyId");
Long hostingFieldId = issueHosting.getHostingField().getId();
if (type == IssueHistoryType.ADD) {
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
index 46fda1f..0c425db 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
@@ -260,12 +260,6 @@
}
}
issueTypeVo.setUseCompanyVos(useCompanyVos);
-
- /*CompanyField companyField = issueType.getCompanyField();
- if(companyField != null){
- issueTypeVo.setCompanyFieldVo(ConvertUtil.copyProperties(issueType.getCompanyField(), CompanyFieldVo.class));
- }
- */
}
resJsonData.put(Constants.RES_KEY_CONTENTS, issueTypeVo);
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index 8700bf4..61526a5 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -778,7 +778,7 @@
if (result.data.data.issueCompanyVos != null && result.data.data.issueCompanyVos.length > 0) {
$scope.vm.form.issueCompanyFields = result.data.data.issueCompanyVos;
var issueCompanyFieldValue = result.data.data.issueCompanyVos[0];
- $scope.vm.companyId = issueCompanyFieldValue.id;
+ $scope.vm.companyId = issueCompanyFieldValue.companyId;
$scope.vm.companyName = issueCompanyFieldValue.name;
$scope.vm.companyManager = issueCompanyFieldValue.manager;
$scope.vm.companyTel = issueCompanyFieldValue.tel;
@@ -788,7 +788,7 @@
if (result.data.data.issueIspVos != null && result.data.data.issueIspVos.length > 0) {
$scope.vm.form.issueIspFields = result.data.data.issueIspVos;
var issueIspFieldValue = result.data.data.issueIspVos[0];
- $scope.vm.ispId = issueIspFieldValue.id;
+ $scope.vm.ispId = issueIspFieldValue.ispId;
$scope.vm.ispName = issueIspFieldValue.name;
$scope.vm.ispCode = issueIspFieldValue.code;
$scope.vm.ispManager = issueIspFieldValue.manager;
@@ -800,7 +800,7 @@
if (result.data.data.issueHostingVos != null && result.data.data.issueHostingVos.length > 0) {
$scope.vm.form.issueHostingFields = result.data.data.issueHostingVos;
var issueHostingFieldValue = result.data.data.issueHostingVos[0];
- $scope.vm.hostingId = issueHostingFieldValue.id;
+ $scope.vm.hostingId = issueHostingFieldValue.hostingId;
$scope.vm.hostingName = issueHostingFieldValue.name;
$scope.vm.hostingCode = issueHostingFieldValue.code;
$scope.vm.hostingManager = issueHostingFieldValue.manager;
--
Gitblit v1.8.0