From eb97c024100641e9f123e647654a7f7167a414db Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 28 12월 2021 15:32:56 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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 3a5ad54..80b12e2 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
@@ -450,7 +450,7 @@
public void recordRemoveWorkflowToIssueStatus(String oldIssueStatusName, String newIssueStatusName, StringBuilder description) {
description.append("<ul class=\"activity-list\">");
- String title = "<span translate=\"common.upddetectReservationIssueStatusateWorkflowNotExist\">蹂�寃쎈맂 �썙�겕�뵆濡쒖슦�뿉�꽌 �긽�깭媛� 議댁옱�븯吏� �븡�븘 �씠�뒋�쓽 �긽�깭媛� 蹂�寃쎈릺�뿀�뒿�땲�떎.</span>";
+ String title = "<span translate=\"common.updateWorkflowNotExist\">蹂�寃쎈맂 �썙�겕�뵆濡쒖슦�뿉�꽌 �긽�깭媛� 議댁옱�븯吏� �븡�븘 �씠�뒋�쓽 �긽�깭媛� 蹂�寃쎈릺�뿀�뒿�땲�떎.</span>";
// �씠�젰 �젙蹂대�� html �깭洹몃줈 留뚮뱾�뼱 以��떎.
this.makeIssueHistoryHtml(description, title, oldIssueStatusName, newIssueStatusName);
@@ -554,8 +554,13 @@
// �뾽泥� �젙蹂� 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
@Override
- public void detectIssueCompany(IssueHistoryType type, Map<String, Object> param, IssueCompany issueCompany, StringBuilder description) {
- Long id = MapUtil.getLong(param, "companyId");
+ public void detectIssueCompany(IssueHistoryType type, Map<String, Object> param, CompanyField companyField, IssueCompany issueCompany, StringBuilder description) {
+ Long id = 0L;
+ if (param != null) {
+ id = MapUtil.getLong(param, "companyId");
+ }else if(companyField != null) {
+ id = companyField.getId();
+ }
Long companyFieldId = issueCompany.getCompanyField().getId();
if (type == IssueHistoryType.ADD) { //異붽� �븷 寃쎌슦
@@ -590,8 +595,13 @@
// ISP �젙蹂� 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
@Override
- public void detectIssueIsp(IssueHistoryType type, Map<String, Object> param, IssueIsp issueIsp, StringBuilder description) {
- Long id = MapUtil.getLong(param, "companyId");
+ public void detectIssueIsp(IssueHistoryType type, Map<String, Object> param, IspField ispField, IssueIsp issueIsp, StringBuilder description) {
+ Long id = 0L;
+ if (param != null) {
+ id = MapUtil.getLong(param, "companyId");
+ } else if(ispField != null) {
+ id = ispField.getId();
+ }
Long ispFieldId = issueIsp.getIspField().getId();
if (type == IssueHistoryType.ADD) {
@@ -626,8 +636,13 @@
// �샇�뒪�똿 �젙蹂� 蹂�寃� �젙蹂대�� 湲곕줉�븳�떎.
@Override
- public void detectIssueHosting(IssueHistoryType type, Map<String, Object> param, IssueHosting issueHosting, StringBuilder description) {
- Long id = MapUtil.getLong(param, "companyId");
+ public void detectIssueHosting(IssueHistoryType type, Map<String, Object> param, HostingField hostingField, IssueHosting issueHosting, StringBuilder description) {
+ Long id = 0L;
+ if (param != null) {
+ id = MapUtil.getLong(param, "companyId");
+ }else if(hostingField != null) {
+ id = hostingField.getId();
+ }
Long hostingFieldId = issueHosting.getHostingField().getId();
if (type == IssueHistoryType.ADD) {
--
Gitblit v1.8.0