From 5fb1952ae91f1a739803247266e87dbd15ea1f27 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 13:23:09 +0900
Subject: [PATCH] 충돌 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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 71671dd..375f32b 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueHistoryServiceImpl.java
@@ -63,13 +63,22 @@
@Override
@Transactional
public void addIssueHistory(Issue issue, IssueHistoryType issueHistoryType, String issueChangeDescription) {
+ User user = this.webAppUtil.getLoginUserObject();
+ addIssueHistory(issue, user, issueHistoryType, issueChangeDescription);
+ }
+
+ // �씠�젰 �깮�꽦
+ @Override
+ @Transactional
+ public void addIssueHistory(Issue issue, User user, IssueHistoryType issueHistoryType, String issueChangeDescription) {
IssueHistory issueHistory = new IssueHistory();
issueHistory.setIssue(issue);
issueHistory.setProject(issue.getProject());
issueHistory.setIssueHistoryType(issueHistoryType);
StringBuilder description = new StringBuilder();
// �씠�젰 �젙蹂대�� 留뚮뱾�뼱 �궦�떎.
- this.makeDescription(description, issueHistoryType, issueChangeDescription);
+
+ this.makeDescription(user, description, issueHistoryType, issueChangeDescription);
issueHistory.setDescription(description.toString());
this.issueHistoryRepository.saveAndFlush(issueHistory);
@@ -81,6 +90,13 @@
// �씠�젰 �젙蹂대�� 留뚮뱾�뼱 �궦�떎.
@Override
public void makeDescription(StringBuilder description, IssueHistoryType issueHistoryType, String issueChangeDescription) {
+ User user = this.webAppUtil.getLoginUserObject();
+ makeDescription(user, description, issueHistoryType, issueChangeDescription);
+ }
+
+ // �씠�젰 �젙蹂대�� 留뚮뱾�뼱 �궦�떎.
+ @Override
+ public void makeDescription(User user, StringBuilder description, IssueHistoryType issueHistoryType, String issueChangeDescription) {
description.append("<div class=\"activity-text\">");
// �깮�꽦, �닔�젙, �궘�젣�뿉 ���빐 湲곕줉�쓣 �궓湲대떎.
@@ -90,9 +106,9 @@
description.append("<span class='activity-timestamp'>");
description.append(DateUtil.convertDateToStr(new Date()));
description.append(" (");
- description.append(this.webAppUtil.getLoginUser().getName());
+ description.append(user.getName());
description.append(" - ");
- description.append(CommonUtil.decryptAES128(this.webAppUtil.getLoginUser().getAccount()));
+ description.append(CommonUtil.decryptAES128(user.getAccount()));
description.append(")");
description.append("</span></h6>");
break;
@@ -103,10 +119,10 @@
description.append(DateUtil.convertDateToStr(new Date()));
description.append(" (");
- if (this.webAppUtil.getLoginUser() != null) {
- description.append(this.webAppUtil.getLoginUser().getName());
+ if (user != null) {
+ description.append(user.getName());
description.append(" - ");
- description.append(CommonUtil.decryptAES128(this.webAppUtil.getLoginUser().getAccount()));
+ description.append(CommonUtil.decryptAES128(user.getAccount()));
}
else {
description.append("OWL-ITS-SYSTEM");
@@ -124,9 +140,9 @@
description.append("<span class=\"activity-timestamp\">");
description.append(DateUtil.convertDateToStr(new Date()));
description.append(" (");
- description.append(this.webAppUtil.getLoginUser().getName());
+ description.append(user.getName());
description.append(" - ");
- description.append(CommonUtil.decryptAES128(this.webAppUtil.getLoginUser().getAccount()));
+ description.append(CommonUtil.decryptAES128(user.getAccount()));
description.append(")");
description.append("</span></h6>");
break;
--
Gitblit v1.8.0