From 07f4f6ad9592628ae6e0e77fdd4492b20af098fa Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 17 1월 2022 17:18:14 +0900
Subject: [PATCH] - 버그 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java | 7 ++++++-
src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java | 8 ++++++--
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 2 +-
src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java | 8 ++++++--
4 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
index e97dba6..c7ea8ac 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueCompanyServiceImpl.java
@@ -109,11 +109,11 @@
public void modifyIssueCompanyField(Issue issue, IssueForm issueForm) {
if (issue != null) {
StringBuilder sb = new StringBuilder();
+ IssueCompany issueCompany = this.issueCompanyRepository.findByIssueId(issue.getId());
List<Map<String, Object>> issueCompanyFields = issueForm.getIssueCompanyFields();
if (issueCompanyFields != null && issueCompanyFields.size() > 0) {
Map<String, Object> param = issueCompanyFields.get(0);
- IssueCompany issueCompany = this.issueCompanyRepository.findByIssueId(issue.getId());
if (issueCompany != null) { //�닔�젙 �떆
// 蹂�寃� �씠�젰 癒쇱� �궓湲곌퀬 issueCompany�뿉 set�븯湲�
@@ -176,6 +176,11 @@
} else {
this.issueCompanyRepository.deleteByIssueId(issue.getId());
this.issueCompanyRepository.flush();
+
+ if (issueCompany != null) {
+ issueHistoryService.detectIssueCompany(IssueHistoryType.DELETE, null, null, issueCompany, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ }
}
}
}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
index d33943c..40ec470 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHostingServiceImpl.java
@@ -119,12 +119,11 @@
@Transactional
public void modifyIssueHostingField(Issue issue, IssueForm issueForm) {
if (issue != null) {
+ IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
StringBuilder sb = new StringBuilder();
List<Map<String, Object>> issueHostingFields = issueForm.getIssueHostingFields();
if (issueHostingFields != null && issueHostingFields.size() > 0) {
Map<String, Object> param = issueHostingFields.get(0);
-
- IssueHosting issueHosting = this.issueHostingRepository.findByIssueId(issue.getId());
if (issueHosting != null) { //�닔�젙 �떆
// 蹂�寃� �씠�젰 �궓湲곌퀬 issueHosting�뿉 set �빐二쇨린
@@ -154,6 +153,11 @@
} else {
this.issueHostingRepository.deleteByIssueId(issue.getId());
this.issueHostingRepository.flush();
+
+ if (issueHosting != null) {
+ issueHistoryService.detectIssueHosting(IssueHistoryType.DELETE, null, null, issueHosting, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ }
}
}
}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
index b41b0ef..955cb24 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueIspServiceImpl.java
@@ -119,11 +119,10 @@
public void modifyIssueIspField(Issue issue, IssueForm issueForm) {
if (issue != null) {
StringBuilder sb = new StringBuilder();
+ IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());
List<Map<String, Object>> issueIspFields = issueForm.getIssueIspFields();
if (issueIspFields != null && issueIspFields.size() > 0) {
Map<String, Object> param = issueIspFields.get(0);
-
- IssueIsp issueIsp = this.issueIspRepository.findByIssueId(issue.getId());
if (issueIsp != null) {//�닔�젙 �떆
// 蹂�寃� �씠�젰 �궓湲곌퀬 issueIsp�뿉 set�빐二쇨린
@@ -155,6 +154,11 @@
else {
this.issueIspRepository.deleteByIssueId(issue.getId());
this.issueIspRepository.flush();
+
+ if (issueIsp != null) {
+ issueHistoryService.detectIssueIsp(IssueHistoryType.DELETE, null, null, issueIsp, sb);
+ issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, sb.toString());
+ }
}
}
}
diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
index cdbf380..454e91e 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -520,7 +520,7 @@
// �샇�뒪�똿
case "USE_HOSTING" :
- if (scope.data.ispName !== null) {
+ if (scope.data.hostingName !== null) {
makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.hostingName + "'></span>";
}else {
makeTag += "<span></span>";
--
Gitblit v1.8.0